Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

ui/compositor/layer.cc

Index: ui/compositor/layer.cc
===================================================================
--- ui/compositor/layer.cc	(revision 147935)
+++ ui/compositor/layer.cc	(working copy)
@@ -488,19 +488,11 @@
                           WebKit::WebRect& opaque) {
 #endif
   TRACE_EVENT0("ui", "Layer::paintContents");
-  scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-      web_canvas, ui::GetScaleFactorFromScale(device_scale_factor_)));
+  gfx::Canvas canvas(web_canvas,
+      ui::GetScaleFactorFromScale(device_scale_factor_), scale_content_);
 
-  if (scale_content_) {
-    canvas->Save();
-    canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_),
-                               SkFloatToScalar(device_scale_factor_));
-  }
-
   if (delegate_)
-    delegate_->OnPaintLayer(canvas.get());
-  if (scale_content_)
-    canvas->Restore();
+    delegate_->OnPaintLayer(&canvas);
 }
 
 unsigned Layer::prepareTexture(WebKit::WebTextureUpdater& /* updater */) {