Allow CanvasSkia to bind to an existing SkCanvas.

ui/gfx/compositor/layer_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor_observer.h"
@@ skipping 51 matching lines @@
   gfx::Canvas* CreateCanvasForLayer(const Layer* layer) {
     return gfx::Canvas::CreateCanvas(layer->bounds().width(),
                                      layer->bounds().height(),
                                      false);
   }
 
   void PaintColorToLayer(Layer* layer, SkColor color) {
     scoped_ptr<gfx::Canvas> canvas(CreateCanvasForLayer(layer));
     canvas->FillRectInt(color, 0, 0, layer->bounds().width(),
                         layer->bounds().height());
-    layer->SetCanvas(*canvas->AsCanvasSkia(), layer->bounds().origin());
+    layer->SetCanvas(*canvas->GetSkCanvas(), layer->bounds().origin());
   }
 
   void DrawTree(Layer* root) {
     GetCompositor()->SetRootLayer(root);
     GetCompositor()->Draw(false);
   }
 
   void RunPendingMessages() {
     MessageLoopForUI::current()->RunAllPending();
   }
@@ skipping 146 matching lines @@
   gfx::Canvas* CreateCanvasForLayer(const Layer* layer) {
     return gfx::Canvas::CreateCanvas(layer->bounds().width(),
                                      layer->bounds().height(),
                                      false);
   }
 
   void PaintColorToLayer(Layer* layer, SkColor color) {
     scoped_ptr<gfx::Canvas> canvas(CreateCanvasForLayer(layer));
     canvas->FillRectInt(color, 0, 0, layer->bounds().width(),
                         layer->bounds().height());
-    layer->SetCanvas(*canvas->AsCanvasSkia(), layer->bounds().origin());
+    layer->SetCanvas(canvas->GetSkCanvas(), layer->bounds().origin());
   }
 
   void DrawTree(Layer* root) {
     compositor()->SetRootLayer(root);
     compositor()->Draw(false);
   }
 
   // Invalidates the entire contents of the layer.
   void SchedulePaintForLayer(Layer* layer) {
     layer->SchedulePaint(
@@ skipping 367 matching lines @@
   EXPECT_TRUE(NULL != l122->texture());
 
   // Toggling l2's visibility should drop all sub-layer textures.
   l12->SetVisible(false);
   EXPECT_EQ(NULL, l12->texture());
   EXPECT_EQ(NULL, l121->texture());
   EXPECT_EQ(NULL, l122->texture());
 }
 
 } // namespace ui