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 1211 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.
+  skia::PlatformCanvas* platform_canvas =
+      static_cast<skia::PlatformCanvas*>(canvas);

[vangelis, 2011/04/01 23:35:54]

This seems like a potentially dangerous cast once WebCanvas is changed over to
be an SkCanvas. You can eliminate them if you can find an alternative way of
getting the platform device from the SkCanvas.

[alokp, 2011/04/04 17:00:13]

Ok. Working with reed@ get rid of these static casts.

   skia::VectorPlatformDevice& device =
       static_cast<skia::VectorPlatformDevice&>(
-          canvas->getTopPlatformDevice());
+          platform_canvas->getTopPlatformDevice());
   HDC dc = device.getBitmapDC();
   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));
@@ skipping 68 matching lines @@
     canvas->drawBitmapRect(*bitmap, &src_rect, dest_rect);
 #endif  // defined(OS_MACOSX)
   return true;
 }
 
 #if defined(OS_WIN)
 bool PluginInstance::DrawJPEGToPlatformDC(
     const SkBitmap& bitmap,
     const gfx::Rect& printable_area,
     WebKit::WebCanvas* canvas) {
+  skia::PlatformCanvas* platform_canvas =
+      static_cast<skia::PlatformCanvas*>(canvas);
   skia::VectorPlatformDevice& device =
       static_cast<skia::VectorPlatformDevice&>(
-          canvas->getTopPlatformDevice());
+          platform_canvas->getTopPlatformDevice());
   HDC dc = device.getBitmapDC();
   // 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);
 
   // Ideally we should add JPEG compression to the VectorPlatformDevice class
@@ skipping 134 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