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

views/widget/native_widget_view.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/native_widget_view.h"
 
 #include "ui/gfx/canvas.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
@@ skipping 34 matching lines @@
 // NativeWidgetView, View overrides:
 
 void NativeWidgetView::SchedulePaintInternal(const gfx::Rect& r) {
   View::SchedulePaintInternal(r);
 }
 
 void NativeWidgetView::MarkLayerDirty() {
   View::MarkLayerDirty();
 }
 
-void NativeWidgetView::CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
-                                                          View** ancestor) {
-  View::CalculateOffsetToAncestorWithLayer(offset, ancestor);
+void NativeWidgetView::CalculateOffsetToAncestorWithLayer(
+    gfx::Point* offset,
+    ui::Layer** layer_parent) {
+  View::CalculateOffsetToAncestorWithLayer(offset, layer_parent);
 }
 
 void NativeWidgetView::ViewHierarchyChanged(bool is_add,
                                             View* parent,
                                             View* child) {
   if (is_add && child == this && !sent_create_) {
     sent_create_ = true;
     delegate()->OnNativeWidgetCreated();
   }
 }
@@ skipping 122 matching lines @@
 }
 
 void NativeWidgetView::UpdateLayerBounds(const gfx::Point& offset) {
   View::UpdateLayerBounds(offset);
   if (!layer()) {
     gfx::Point new_offset(offset.x() + x(), offset.y() + y());
     GetAssociatedWidget()->GetRootView()->UpdateLayerBounds(new_offset);
   }
 }
 
-void NativeWidgetView::PaintToLayer(const gfx::Rect& dirty_rect) {
-  View::PaintToLayer(dirty_rect);
-
-  View* root = GetAssociatedWidget()->GetRootView();
-  gfx::Rect root_dirty_rect = dirty_rect;
-  root->GetTransform().TransformRectReverse(&root_dirty_rect);
-  root_dirty_rect =
-      gfx::Rect(gfx::Point(), root->size()).Intersect(root_dirty_rect);
-
-  if (!root_dirty_rect.IsEmpty())
-    root->PaintToLayer(root_dirty_rect);
-}
-
-void NativeWidgetView::PaintComposite() {
-  View::PaintComposite();
-  GetAssociatedWidget()->GetRootView()->PaintComposite();
-}
-
 }  // namespace internal
 }  // namespace views