2 files changed, 5 insertions, 13 deletions
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 6c30d52..a3ae747 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -488,19 +488,11 @@ void Layer::paintContents(WebKit::WebCanvas* web_canvas,
                           WebKit::WebRect& opaque) {
 #endif
   TRACE_EVENT0("ui", "Layer::paintContents");
-  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-      web_canvas, ui::GetScaleFactorFromScale(device_scale_factor_)));
-
-  if (scale_content_) {
-    canvas->Save();
-    canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_),
-                               SkFloatToScalar(device_scale_factor_));
-  }
+  gfx::Canvas canvas(web_canvas,
+      ui::GetScaleFactorFromScale(device_scale_factor_), scale_content_);
 
   if (delegate_)
-    delegate_->OnPaintLayer(canvas.get());
-  if (scale_content_)
-    canvas->Restore();
+    delegate_->OnPaintLayer(&canvas);
 }
 
 unsigned Layer::prepareTexture(WebKit::WebTextureUpdater& /* updater */) {
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 6c76161..c72bdd4 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -238,8 +238,8 @@ class TestLayerDelegate : public LayerDelegate {
 
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
-    gfx::ImageSkiaRep contents = canvas->ExtractImageRep();
-    paint_size_ = gfx::Size(contents.GetWidth(), contents.GetHeight());
+    SkBitmap contents = canvas->ExtractBitmap();
+    paint_size_ = gfx::Size(contents.width(), contents.height());
     canvas->FillRect(gfx::Rect(paint_size_), colors_[color_index_]);
     color_index_ = (color_index_ + 1) % static_cast<int>(colors_.size());
     const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix();