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

views/widget/root_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/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 137 matching lines @@
 
 bool RootView::IsVisibleInRootView() const {
   return IsVisible();
 }
 
 std::string RootView::GetClassName() const {
   return kViewClassName;
 }
 
 void RootView::SchedulePaintInRect(const gfx::Rect& rect) {
-  MarkLayerDirty();
-  SchedulePaintInternal(rect);
-}
-
-void RootView::SchedulePaintInternal(const gfx::Rect& rect) {
   gfx::Rect xrect = ConvertRectToParent(rect);
   gfx::Rect invalid_rect = GetLocalBounds().Intersect(xrect);
   if (!invalid_rect.IsEmpty())
     widget_->SchedulePaintInRect(invalid_rect);
 }
 
 bool RootView::OnMousePressed(const MouseEvent& event) {
   MouseEvent e(event, this);
   UpdateCursor(e);
   SetMouseLocationAndFlags(e);
@@ skipping 250 matching lines @@
 }
 
 const ui::Compositor* RootView::GetCompositor() const {
   return widget_->GetCompositor();
 }
 
 ui::Compositor* RootView::GetCompositor() {
   return widget_->GetCompositor();
 }
 
-void RootView::MarkLayerDirty() {
-  View::MarkLayerDirty();
+void RootView::CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
+                                                  ui::Layer** layer_parent) {
+  View::CalculateOffsetToAncestorWithLayer(offset, layer_parent);
   if (!layer())
-    widget_->MarkLayerDirty();
-}
-
-void RootView::CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
-                                                  View** ancestor) {
-  View::CalculateOffsetToAncestorWithLayer(offset, ancestor);
-  if (!layer())
-    widget_->CalculateOffsetToAncestorWithLayer(offset, ancestor);
+    widget_->CalculateOffsetToAncestorWithLayer(offset, layer_parent);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootView, private:
 
 // Input -----------------------------------------------------------------------
 
 void RootView::UpdateCursor(const MouseEvent& event) {
   if (!(event.flags() & ui::EF_IS_NON_CLIENT)) {
     View* v = GetEventHandlerForPoint(event.location());
     widget_->SetCursor(v->GetCursor(MouseEvent(event, this, v)));
   }
 }
 
 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) {
   last_mouse_event_flags_ = event.flags();
   last_mouse_event_x_ = event.x();
   last_mouse_event_y_ = event.y();
 }
 
 }  // namespace internal
 }  // namespace views