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

views/view.h

 // 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.
 
 #ifndef VIEWS_VIEW_H_
 #define VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/accelerator.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/layer_helper.h"
 
 using ui::OSExchangeData;
 
 namespace gfx {
@@ skipping 54 matching lines @@
 //   SprocketLayout system. Alternative Layout Managers implementing the
 //   LayoutManager interface can be used to lay out children if required.
 //
 //   It is up to the subclass to implement Painting and storage of subclass -
 //   specific properties and functionality.
 //
 //   Unless otherwise documented, views is not thread safe and should only be
 //   accessed from the main thread.
 //
 /////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT View : public AcceleratorTarget {
+class VIEWS_EXPORT View : public ui::LayerDelegate,
+                          public AcceleratorTarget {
  public:
   typedef std::vector<View*> Views;
 
   // TO BE MOVED ---------------------------------------------------------------
   // TODO(beng): These methods are to be moved to other files/classes.
 
   // TODO(beng): delete
   // Set whether this view is hottracked. A disabled view cannot be hottracked.
   // If flag differs from the current value, SchedulePaint is invoked.
   virtual void SetHotTracked(bool flag);
@@ skipping 849 matching lines @@
 
   // Override to paint a border not specified by SetBorder().
   virtual void OnPaintBorder(gfx::Canvas* canvas);
 
   // Override to paint a focus border (usually a dotted rectangle) around
   // relevant contents.
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
 
   // Accelerated painting ------------------------------------------------------
 
-  // Invoked from SchedulePaintInRect. Invokes SchedulePaintInternal on the
-  // parent. This does not mark the layer as dirty. It's assumed the caller has
-  // done this. You should not need to invoke this, use SchedulePaint or
-  // SchedulePaintInRect instead.
-  virtual void SchedulePaintInternal(const gfx::Rect& r);
-
-  // If our layer is out of date invokes Paint() with a canvas that is then
-  // copied to the layer. If the layer is not out of date recursively descends
-  // in case any children needed their layers updated.
-  //
-  // This is invoked internally by Widget and painting code.
-  virtual void PaintToLayer(const gfx::Rect& dirty_rect);
-
-  // Instructs the compositor to show our layer and all children layers.
-  // Invokes OnWillCompositeLayer() for any views that have layers.
-  //
-  // This is invoked internally by Widget and painting code.
-  virtual void PaintComposite();
-
-  // Invoked from |PaintComposite| if this view has a layer and before the
-  // layer is rendered by the compositor.
-  virtual void OnWillCompositeLayer();
-
   // This creates a layer for the view, if one does not exist. It then
   // passes the texture to a layer associated with the view. While an external
   // texture is set, the view will not update the layer contents.
   //
   // Passing NULL resets to default behavior.
   //
   // Returns false if it cannot create a layer to which to assign the texture.
   bool SetExternalTexture(ui::Texture* texture);
 
   // Returns the Compositor.
   virtual const ui::Compositor* GetCompositor() const;
   virtual ui::Compositor* GetCompositor();
 
-  // Marks the layer this view draws into as dirty.
-  virtual void MarkLayerDirty();
-
-  // Returns the offset from this view to the neareset ancestor with a layer.
-  // If |ancestor| is non-NULL it is set to the nearset ancestor with a layer.
-  virtual void CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
-                                                  View** ancestor);
+  // Returns the offset from this view to the nearest ancestor with a layer.
+  // If |ancestor| is non-NULL it is set to the nearest ancestor with a layer.
+  virtual void CalculateOffsetToAncestorWithLayer(
+      gfx::Point* offset,
+      ui::Layer** layer_parent);
 
   // Creates a layer for this and recurses through all descendants.
   virtual void CreateLayerIfNecessary();
 
   // If this view has a layer, the layer is reparented to |parent_layer| and its
   // bounds is set based on |point|. If this view does not have a layer, then
   // recurses through all children. This is used when adding a layer to an
   // existing view to make sure all descendants that have layers are parented to
   // the right layer.
   virtual void MoveLayerToParent(ui::Layer* parent_layer,
                                  const gfx::Point& point);
 
   // Destroys the layer on this view and all descendants. Intended for when a
   // view is being removed or made invisible.
   virtual void DestroyLayerRecurse();
 
   // Resets the bounds of the layer associated with this view and all
   // descendants.
   virtual void UpdateLayerBounds(const gfx::Point& offset);
 
+  // Overridden from ui::LayerDelegate:
+  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
+
   // Input ---------------------------------------------------------------------
 
   // Called by HitTest to see if this View has a custom hit test mask. If the
   // return value is true, GetHitTestMask will be called to obtain the mask.
   // Default value is false, in which case the View will hit-test against its
   // bounds.
   virtual bool HasHitTestMask() const;
 
   // Called by HitTest to retrieve a mask for hit-testing against. Subclasses
   // override to provide custom shaped hit test regions.
@@ skipping 95 matching lines @@
     SCHEDULE_PAINT_SIZE_SAME,
 
     // Indicates the size changed (and possibly the origin).
     SCHEDULE_PAINT_SIZE_CHANGED
   };
 
   // Invoked before and after the bounds change to schedule painting the old and
   // new bounds.
   void SchedulePaintBoundsChanged(SchedulePaintType type);
 
+  // Common Paint() code shared by accelerated and non-accelerated code paths to
+  // invoke OnPaint() on the View.
+  void PaintCommon(gfx::Canvas* canvas);
+
   // Tree operations -----------------------------------------------------------
 
   // Removes |view| from the hierarchy tree.  If |update_focus_cycle| is true,
   // the next and previous focusable views of views pointing to this view are
   // updated.  If |update_tool_tip| is true, the tooltip is updated.  If
   // |delete_removed_view| is true, the view is also deleted (if it is parent
   // owned).
   void DoRemoveChildView(View* view,
                          bool update_focus_cycle,
                          bool update_tool_tip,
@@ skipping 297 matching lines @@
 #if defined(OS_WIN)
   scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_VIEW_H_