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

ui/compositor/layer.cc

 // Copyright (c) 2012 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 "ui/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 470 matching lines @@
 }
 
 void Layer::paintContents(WebKit::WebCanvas* web_canvas,
                           const WebKit::WebRect& clip,
 #if defined(WEBCONTENTLAYERCLIENT_FLOAT_OPAQUE_RECT)
                           WebKit::WebFloatRect& opaque) {
 #else
                           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 */) {
   DCHECK(layer_updated_externally_);
   return texture_->texture_id();
 }
 
 WebKit::WebGraphicsContext3D* Layer::context() {
   DCHECK(layer_updated_externally_);
   return texture_->HostContext3D();
@@ skipping 251 matching lines @@
     return;
   unsigned int color = 0xFF000000;
   color |= web_layer_is_accelerated_ ? 0x0000FF00 : 0x00FF0000;
   bool opaque = fills_bounds_opaquely_ && (GetCombinedOpacity() == 1.f);
   if (!opaque)
     color |= 0xFF;
   web_layer_.setDebugBorderColor(color);
 }
 
 }  // namespace ui