This change implements a first pass in the effort to remove the dependency of PlatformDevice within Chrome. The Skia library now provides multiple back-ends for the SkDevice class, so PlatformDevice's inheritance of SkDevice, and the assumption of instances of PlatformDevice limits the use of these new back-ends.

A new set of helper functions is provided for the PlatformDevice entry points.  Upon construction of a PlatformDevice, a pointer to the interface is cached in the parent SkDevice's SkMetaData.  The new helper functions forward calls to the interface cached in the metadata.

BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7019013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86625 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 14 insertions, 13 deletions

diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc
index dc34edb..7e2f584 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc
@@ -111,9 +111,9 @@ void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
                                   const gfx::Rect& rect) {
   if (!windowless_)
     return;
-  cairo_t* context = skia::BeginPlatformPaint(canvas);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas);
+  cairo_t* context = scoped_platform_paint.GetPlatformSurface();
   WindowlessPaint(context, rect);
-  skia::EndPlatformPaint(canvas);
 }
 
 void WebPluginDelegateImpl::InstallMissingPlugin() {
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
index c055773..0b4b7ee 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
@@ -465,9 +465,9 @@ void WebPluginDelegateImpl::PlatformDestroyInstance() {
 void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
                                   const gfx::Rect& rect) {
   if (windowless_) {
-    HDC hdc = skia::BeginPlatformPaint(canvas);
+    skia::ScopedPlatformPaint scoped_platform_paint(canvas);
+    HDC hdc = scoped_platform_paint.GetPlatformSurface();
     WindowlessPaint(hdc, rect);
-    skia::EndPlatformPaint(canvas);
   }
 }
 
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 0da964a..a8cd049 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1466,7 +1466,8 @@ bool PluginInstance::DrawJPEGToPlatformDC(
     return false;
   }
 
-  HDC dc = skia::BeginPlatformPaint(canvas);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas);
+  HDC dc = scoped_platform_paint.GetPlatformSurface();
   // 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.
@@ -1485,7 +1486,6 @@ bool PluginInstance::DrawJPEGToPlatformDC(
                 &compressed_image.front(),
                 reinterpret_cast<const BITMAPINFO*>(&bmi),
                 DIB_RGB_COLORS, SRCCOPY);
-  skia::EndPlatformPaint(canvas);
   return true;
 }
 #endif  // OS_WIN
diff --git a/webkit/plugins/ppapi/ppb_image_data_impl.cc b/webkit/plugins/ppapi/ppb_image_data_impl.cc
index 9f5c15c..2f722e0 100644
--- a/webkit/plugins/ppapi/ppb_image_data_impl.cc
+++ b/webkit/plugins/ppapi/ppb_image_data_impl.cc
@@ -106,7 +106,7 @@ void* PPB_ImageData_Impl::Map() {
       return NULL;
   }
   const SkBitmap& bitmap =
-      mapped_canvas_->getTopPlatformDevice().accessBitmap(true);
+      skia::GetTopDevice(*mapped_canvas_)->accessBitmap(true);
 
   // Our platform bitmaps are set to opaque by default, which we don't want.
   const_cast<SkBitmap&>(bitmap).setIsOpaque(false);
@@ -129,7 +129,7 @@ int PPB_ImageData_Impl::GetSharedMemoryHandle(uint32* byte_count) const {
 const SkBitmap* PPB_ImageData_Impl::GetMappedBitmap() const {
   if (!mapped_canvas_.get())
     return NULL;
-  return &mapped_canvas_->getTopPlatformDevice().accessBitmap(false);
+  return &skia::GetTopDevice(*mapped_canvas_)->accessBitmap(false);
 }
 
 void PPB_ImageData_Impl::Swap(PPB_ImageData_Impl* other) {
diff --git a/webkit/plugins/ppapi/ppb_pdf_impl.cc b/webkit/plugins/ppapi/ppb_pdf_impl.cc
index f58b823..a8be7cd 100644
--- a/webkit/plugins/ppapi/ppb_pdf_impl.cc
+++ b/webkit/plugins/ppapi/ppb_pdf_impl.cc
@@ -153,7 +153,7 @@ PP_Resource GetResourceImage(PP_Instance instance_id,
 
   skia::PlatformCanvas* canvas = image_data->mapped_canvas();
   SkBitmap& ret_bitmap =
-      const_cast<SkBitmap&>(canvas->getTopPlatformDevice().accessBitmap(true));
+      const_cast<SkBitmap&>(skia::GetTopDevice(*canvas)->accessBitmap(true));
   if (!res_bitmap->copyTo(&ret_bitmap, SkBitmap::kARGB_8888_Config, NULL)) {
     return 0;
   }
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
index 904c804..3820cca 100644
--- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
+++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc
@@ -178,8 +178,8 @@ bool PPB_Scrollbar_Impl::Paint(const PP_Rect* rect, PPB_ImageData_Impl* image) {
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() == base::win::VERSION_XP) {
-    canvas->getTopPlatformDevice().makeOpaque(
-        gfx_rect.x(), gfx_rect.y(), gfx_rect.width(), gfx_rect.height());
+    skia::MakeOpaque(canvas, gfx_rect.x(), gfx_rect.y(),
+                     gfx_rect.width(), gfx_rect.height());
   }
 #endif
 
diff --git a/webkit/plugins/sad_plugin.cc b/webkit/plugins/sad_plugin.cc
index c129d34..b85d48a 100644
--- a/webkit/plugins/sad_plugin.cc
+++ b/webkit/plugins/sad_plugin.cc
@@ -38,9 +38,10 @@ void PaintSadPlugin(WebKit::WebCanvas* webcanvas,
   // 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 = skia::BeginPlatformPaint(webcanvas);
+  skia::ScopedPlatformPaint scoped_platform_paint(webcanvas);
+  gfx::NativeDrawingContext context =
+      scoped_platform_paint.GetPlatformSurface();
   BlitCanvasToContext(context, plugin_rect, &canvas, gfx::Point(0, 0));
-  skia::EndPlatformPaint(webcanvas);
 #elif WEBKIT_USING_CG
   BlitCanvasToContext(webcanvas, plugin_rect, &canvas, gfx::Point(0, 0));
 #endif