Eliminate skia::PlatformCanvas - Step 1

webkit/plugins/ppapi/ppapi_plugin_instance.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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 1213 matching lines @@
     page_rect.origin.y = current_print_settings_.printable_area.point.y;
     page_rect.size.width = current_print_settings_.printable_area.size.width;
     page_rect.size.height = current_print_settings_.printable_area.size.height;
 
     ret = metafile->RenderPage(1, canvas, page_rect, true, false, true, true);
     CGContextRestoreGState(canvas);
   }
 #elif defined(OS_WIN)
   // On Windows, we now need to render the PDF to the DC that backs the
   // supplied canvas.
-  HDC dc = canvas->beginPlatformPaint();
+  HDC dc = skia::BeginPlatformPaint(canvas);
   gfx::Size size_in_pixels;
   size_in_pixels.set_width(
       printing::ConvertUnit(current_print_settings_.printable_area.size.width,
                             static_cast<int>(printing::kPointsPerInch),
                             current_print_settings_.dpi));
   size_in_pixels.set_height(
       printing::ConvertUnit(current_print_settings_.printable_area.size.height,
                             static_cast<int>(printing::kPointsPerInch),
                             current_print_settings_.dpi));
   // We need to render using the actual printer DPI (rendering to a smaller
   // set of pixels leads to a blurry output). However, we need to counter the
   // scaling up that will happen in the browser.
   XFORM xform = {0};
   xform.eM11 = xform.eM22 = static_cast<float>(printing::kPointsPerInch) /
       static_cast<float>(current_print_settings_.dpi);
   ModifyWorldTransform(dc, &xform, MWT_LEFTMULTIPLY);
 
   ret = render_proc(buffer->mapped_buffer(), buffer->size(), 0, dc,
                     current_print_settings_.dpi, current_print_settings_.dpi,
                     0, 0, size_in_pixels.width(),
                     size_in_pixels.height(), true, false, true, true);
-  canvas->endPlatformPaint();
+  skia::EndPlatformPaint(canvas);
 #endif  // defined(OS_WIN)
 
   return ret;
 }
 
 bool PluginInstance::PrintRasterOutput(PP_Resource print_output,
                                        WebKit::WebCanvas* canvas) {
   scoped_refptr<PPB_ImageData_Impl> image(
       Resource::GetAs<PPB_ImageData_Impl>(print_output));
   if (!image.get() || !image->is_mapped())
@@ skipping 66 matching lines @@
       reinterpret_cast<const unsigned char*>(pixels),
       gfx::JPEGCodec::FORMAT_BGRA, bitmap.width(), bitmap.height(),
       static_cast<int>(bitmap.rowBytes()), 100, &compressed_image);
   UMA_HISTOGRAM_TIMES("PepperPluginPrint.RasterBitmapCompressTime",
                       base::TimeTicks::Now() - start_time);
   if (!encoded) {
     NOTREACHED();
     return false;
   }
 
-  HDC dc = canvas->beginPlatformPaint();
+  HDC dc = skia::BeginPlatformPaint(canvas);
   // TODO(sanjeevr): This is a temporary hack. If we output a JPEG
   // to the EMF, the EnumEnhMetaFile call fails in the browser
   // process. The failure also happens if we output nothing here.
   // We need to investigate the reason for this failure and fix it.
   // In the meantime this temporary hack of drawing an empty
   // rectangle in the DC gets us by.
   Rectangle(dc, 0, 0, 0, 0);
   BITMAPINFOHEADER bmi = {0};
   gfx::CreateBitmapHeader(bitmap.width(), bitmap.height(), &bmi);
   bmi.biCompression = BI_JPEG;
   bmi.biSizeImage = compressed_image.size();
   bmi.biHeight = -bmi.biHeight;
   StretchDIBits(dc, printable_area.x(), printable_area.y(),
                 printable_area.width(), printable_area.height(),
                 0, 0, bitmap.width(), bitmap.height(),
                 &compressed_image.front(),
                 reinterpret_cast<const BITMAPINFO*>(&bmi),
                 DIB_RGB_COLORS, SRCCOPY);
-  canvas->endPlatformPaint();
+  skia::EndPlatformPaint(canvas);
   return true;
 }
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 void PluginInstance::DrawSkBitmapToCanvas(
     const SkBitmap& bitmap, WebKit::WebCanvas* canvas,
     const gfx::Rect& dest_rect,
     int canvas_height) {
   SkAutoLockPixels lock(bitmap);
@@ skipping 95 matching lines @@
   return found->second;
 }
 
 bool PluginInstance::IsFullPagePlugin() const {
   WebFrame* frame = container()->element().document().frame();
   return frame->view()->mainFrame()->document().isPluginDocument();
 }
 
 }  // namespace ppapi
 }  // namespace webkit