Eliminate skia::PlatformCanvas - Step 1

webkit/plugins/sad_plugin.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/sad_plugin.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 20 matching lines @@
   canvas.drawRectCoords(0, 0, SkIntToScalar(width), SkIntToScalar(height),
                         paint);
   canvas.DrawBitmapInt(sad_plugin_bitmap,
                        std::max(0, (width - sad_plugin_bitmap.width()) / 2),
                        std::max(0, (height - sad_plugin_bitmap.height()) / 2));
 
   // It's slightly less code to make a big SkBitmap of the sad tab image and
   // then copy that to the screen than to use the native APIs. The small speed
   // penalty is not important when drawing crashed plugins.
 #if WEBKIT_USING_SKIA
-  gfx::NativeDrawingContext context = webcanvas->beginPlatformPaint();

[reed1, 2011/04/01 17:44:42]

I presume these casts get replaced by some static function in the future, where
PlatformCanvas goes away permanently?

[alokp, 2011/04/01 19:57:38]

Done.

+  skia::PlatformCanvas* platform_canvas =
+      static_cast<skia::PlatformCanvas*>(webcanvas);
+  gfx::NativeDrawingContext context = platform_canvas->beginPlatformPaint();
   BlitCanvasToContext(context, plugin_rect, &canvas, gfx::Point(0, 0));
-  webcanvas->endPlatformPaint();
+  platform_canvas->endPlatformPaint();
 #elif WEBKIT_USING_CG
   BlitCanvasToContext(webcanvas, plugin_rect, &canvas, gfx::Point(0, 0));
 #endif
 }
 
 }  // namespace webkit