Update Texture/Layer SetCanvas, callsites, and comments.

Fix TestTexture and ViewLayerTest compile.

BUG=90548
TEST=none

Review URL: http://codereview.chromium.org/7470030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94241 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 8 deletions

diff --git a/views/view.cc b/views/view.cc
index 9105c91..c6cefcd 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -762,9 +762,7 @@ void View::Paint(gfx::Canvas* canvas) {
   PaintChildren(canvas);
 
   if (layer_canvas.get()) {
-    layer()->SetBitmap(
-        layer_canvas->AsCanvasSkia()->getDevice()->accessBitmap(false),
-        layer_rect.origin());
+    layer()->SetCanvas(*layer_canvas->AsCanvasSkia(), layer_rect.origin());
     layer_helper_->set_bitmap_needs_updating(false);
   }
 }
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 1499dda..8e7cc6a 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -2289,16 +2289,16 @@ class TestTexture : public ui::Texture {
   static void reset_live_count() { live_count_ = 0; }
   static int live_count() { return live_count_; }
 
-  // Bounds of the last bitmap passed to SetBitmap.
+  // Bounds of the last bitmap passed to SetCanvas.
   const gfx::Rect& bounds_of_last_paint() const {
     return bounds_of_last_paint_;
   }
 
   // ui::Texture
-  virtual void SetBitmap(const SkBitmap& bitmap,
+  virtual void SetCanvas(const SkCanvas& canvas,
                          const gfx::Point& origin,
                          const gfx::Size& overall_size) OVERRIDE;
-  virtual void Draw(const ui::Transform& transform) OVERRIDE {}
+  virtual void Draw(const ui::TextureDrawParams& params) OVERRIDE {}
 
  private:
   // Number of live instances.
@@ -2312,9 +2312,10 @@ class TestTexture : public ui::Texture {
 // static
 int TestTexture::live_count_ = 0;
 
-void TestTexture::SetBitmap(const SkBitmap& bitmap,
+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());
 }
@@ -2645,7 +2646,7 @@ TEST_F(ViewLayerTest, DISABLED_NativeWidgetView) {
 
   // NativeWidgetView should have been added to view.
   ASSERT_EQ(1, view->child_count());
-  View* widget_view_host = view->GetChildViewAt(0);
+  View* widget_view_host = view->child_at(0);
   ASSERT_TRUE(widget_view_host->layer() != NULL);
   EXPECT_EQ(gfx::Rect(11, 22, 100, 200), widget_view_host->layer()->bounds());