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

chrome/renderer/print_web_view_helper.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 "chrome/renderer/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 435 matching lines @@
   paint->SetFontSize(printing::kSettingHeaderFooterFontSize /
                      webkit_scale_factor);
   gfx::Size size(paint->GetStringSize());
   gfx::Rect rect(point.x(), point.y() - paint->GetBaseline(),
                  size.width(), size.height());
   paint->SetDisplayRect(rect);
   {
     SkMatrix m = canvas->getTotalMatrix();
     ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
         SkScalarAbs(m.getScaleX()));
-    scoped_ptr<gfx::Canvas> gfx_canvas(gfx::Canvas::CreateCanvasWithoutScaling(
-        canvas, device_scale_factor));
-    paint->Draw(gfx_canvas.get());
+    gfx::Canvas gfx_canvas(canvas, device_scale_factor, false);
+    paint->Draw(&gfx_canvas);
   }
 #else
   // TODO(arthurhsu): following code has issues with i18n BiDi, see
   //                  crbug.com/108599.
   size_t text_byte_length = text.length() * sizeof(char16);
   double text_width_in_points = SkScalarToDouble(paint.measureText(
       text.c_str(), text_byte_length));
   SkPoint point = GetHeaderFooterPosition(webkit_scale_factor, page_layout,
                                           horizontal_position,
                                           vertical_position, offset_to_baseline,
@@ skipping 1406 matching lines @@
   DCHECK(IsRendering());
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }