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

views/view_unittest.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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 49 matching lines @@
     last_clip_.setEmpty();
     accelerator_count_map_.clear();
   }
 
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
   virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
   virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void SchedulePaintInternal(const gfx::Rect& rect) OVERRIDE;
+  virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
 
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
   // MouseEvent.
   int last_mouse_event_type_;
   gfx::Point location_;
 
@@ skipping 310 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Painting
 ////////////////////////////////////////////////////////////////////////////////
 
 void TestView::Paint(gfx::Canvas* canvas) {
   canvas->AsCanvasSkia()->getClipBounds(&last_clip_);
 }
 
-void TestView::SchedulePaintInternal(const gfx::Rect& rect) {
+void TestView::SchedulePaintInRect(const gfx::Rect& rect) {
   scheduled_paint_rects_.push_back(rect);
-  View::SchedulePaintInternal(rect);
+  View::SchedulePaintInRect(rect);
 }
 
 void CheckRect(const SkRect& check_rect, const SkRect& target_rect) {
   EXPECT_EQ(target_rect.fLeft, check_rect.fLeft);
   EXPECT_EQ(target_rect.fRight, check_rect.fRight);
   EXPECT_EQ(target_rect.fTop, check_rect.fTop);
   EXPECT_EQ(target_rect.fBottom, check_rect.fBottom);
 }
 
 /* This test is disabled because it is flakey on some systems.
@@ skipping 1059 matching lines @@
   TransformPaintView() {}
   virtual ~TransformPaintView() {}
 
   void ClearScheduledPaintRect() {
     scheduled_paint_rect_ = gfx::Rect();
   }
 
   gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; }
 
   // Overridden from View:
-  virtual void SchedulePaintInternal(const gfx::Rect& rect) {
+  virtual void SchedulePaintInRect(const gfx::Rect& rect) {
     gfx::Rect xrect = ConvertRectToParent(rect);
     scheduled_paint_rect_ = scheduled_paint_rect_.Union(xrect);
   }
 
  private:
   gfx::Rect scheduled_paint_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(TransformPaintView);
 };
 
@@ skipping 844 matching lines @@
 void TestTexture::SetCanvas(const SkCanvas& canvas,
                             const gfx::Point& origin,
                             const gfx::Size& overall_size) {
   const SkBitmap& bitmap = canvas.getDevice()->accessBitmap(false);
   bounds_of_last_paint_.SetRect(
       origin.x(), origin.y(), bitmap.width(), bitmap.height());
 }
 
 class TestCompositor : public ui::Compositor {
  public:
-  TestCompositor() : Compositor(gfx::Size(100, 100)) {}
+  TestCompositor() : Compositor(NULL, gfx::Size(100, 100)) {}
 
   // ui::Compositor:
   virtual ui::Texture* CreateTexture() OVERRIDE {
     return new TestTexture();
   }
-  virtual void NotifyStart() OVERRIDE {}
-  virtual void NotifyEnd() OVERRIDE {}
+  virtual void OnNotifyStart() OVERRIDE {}
+  virtual void OnNotifyEnd() OVERRIDE {}
   virtual void Blur(const gfx::Rect& bounds) OVERRIDE {}
-  virtual void SchedulePaint() OVERRIDE {}
 
  protected:
   virtual void OnWidgetSizeChanged() OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestCompositor);
 };
 
 static ui::Compositor* TestCreateCompositor() {
   return new TestCompositor();
@@ skipping 431 matching lines @@
   EXPECT_EQ(gfx::Rect(11, 22, 100, 200), widget_view_host->layer()->bounds());
   ASSERT_TRUE(child_view->layer() != NULL);
   EXPECT_EQ(gfx::Rect(5, 6, 10, 11), child_view->layer()->bounds());
 
   child_widget->CloseNow();
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views