Rework View Layer Draw() to use the Layer::DrawTree() method and the LayerDelegate.

views/widget/widget.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/compositor/compositor.h"
+#include "ui/gfx/compositor/layer.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/focus/focus_manager_factory.h"
 #include "views/focus/view_storage.h"
 #include "views/ime/input_method.h"
 #include "views/views_delegate.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/root_view.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget_delegate.h"
@@ skipping 716 matching lines @@
 }
 
 const ui::Compositor* Widget::GetCompositor() const {
   return native_widget_->GetCompositor();
 }
 
 ui::Compositor* Widget::GetCompositor() {
   return native_widget_->GetCompositor();
 }
 
-void Widget::MarkLayerDirty() {
-  native_widget_->MarkLayerDirty();
-}
-
 void Widget::CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
-                                                View** ancestor) {
-  native_widget_->CalculateOffsetToAncestorWithLayer(offset, ancestor);
+                                                ui::Layer** layer_parent) {
+  native_widget_->CalculateOffsetToAncestorWithLayer(offset, layer_parent);
 }
 
 void Widget::NotifyAccessibilityEvent(
     View* view,
     ui::AccessibilityTypes::Event event_type,
     bool send_native_event) {
   // Send the notification to the delegate.
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->NotifyAccessibilityEvent(view, event_type);
 
@@ skipping 144 matching lines @@
 bool Widget::HasFocusManager() const {
   return !!focus_manager_.get();
 }
 
 bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
   ui::Compositor* compositor = GetCompositor();
   if (!compositor)
     return false;
 
   compositor->NotifyStart();
-  GetRootView()->PaintToLayer(dirty_region);
-  GetRootView()->PaintComposite();
+  GetRootView()->layer()->Draw();
   compositor->NotifyEnd();
   return true;
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(canvas);
 }
 
 int Widget::GetNonClientComponent(const gfx::Point& point) {
   return non_client_view_ ? non_client_view_->NonClientHitTest(point) : 0;
@@ skipping 213 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views