Removal of dependencies on PlatformDevice classes.

content/renderer/webplugin_delegate_proxy.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 "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 832 matching lines @@
   // may project outside the image, so intersect their rects.
   gfx::Rect content_rect = rect.Intersect(full_content_rect);
 
 #if defined(OS_MACOSX)
   const unsigned char* page_bytes = static_cast<const unsigned char*>(
       CGBitmapContextGetData(context));
   int page_stride = CGBitmapContextGetBytesPerRow(context);
   int page_start_x = content_rect.x() - context_offset_x;
   int page_start_y = content_rect.y() - context_offset_y;
 
-  CGContextRef bg_context =
-      background_store_canvas_->getTopPlatformDevice().GetBitmapContext();
+  CGContextRef bg_context = skia::GetBitmapContext(

[alokp, 2011/05/19 18:15:15]

skia::GetBitmapContext should be replaced by skia::BeginPlatformPaint

[Jeff Timanus, 2011/05/19 20:38:29]

Done.

I still kept the GetBitmapContext helper function around for it's current use in
webkit glue: 
http://www.google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/webkit/glue/webkit_g...

I did not want to introduce an un-paired BeginPlatformPaint call.

+      &background_store_canvas_->getTopDevice());
+
   DCHECK_EQ(CGBitmapContextGetBitsPerPixel(context),
             CGBitmapContextGetBitsPerPixel(bg_context));
   const unsigned char* bg_bytes = static_cast<const unsigned char*>(
       CGBitmapContextGetData(bg_context));
   int full_bg_width = CGBitmapContextGetWidth(bg_context);
   int full_bg_height = CGBitmapContextGetHeight(bg_context);
   int bg_stride = CGBitmapContextGetBytesPerRow(bg_context);
   int bg_last_row = CGBitmapContextGetHeight(bg_context) - 1;
 
   int bytes_per_pixel = CGBitmapContextGetBitsPerPixel(context) / 8;
 #else
   cairo_surface_flush(page_surface);
   const unsigned char* page_bytes = cairo_image_surface_get_data(page_surface);
   int page_stride = cairo_image_surface_get_stride(page_surface);
   int page_start_x = static_cast<int>(page_x_double);
   int page_start_y = static_cast<int>(page_y_double);
 
-  skia::PlatformDevice& device =
-      background_store_canvas_->getTopPlatformDevice();
-  cairo_surface_t* bg_surface = cairo_get_target(device.BeginPlatformPaint());
+  SkDevice& device = background_store_canvas_->getTopDevice();
+  cairo_surface_t* bg_surface =
+      cairo_get_target(skia::BeginPlatformPaint(&device));
   DCHECK_EQ(cairo_surface_get_type(bg_surface), CAIRO_SURFACE_TYPE_IMAGE);
   DCHECK_EQ(cairo_image_surface_get_format(bg_surface), CAIRO_FORMAT_ARGB32);
   cairo_surface_flush(bg_surface);
   const unsigned char* bg_bytes = cairo_image_surface_get_data(bg_surface);
   int full_bg_width = cairo_image_surface_get_width(bg_surface);
   int full_bg_height = cairo_image_surface_get_height(bg_surface);
   int bg_stride = cairo_image_surface_get_stride(bg_surface);
 
   int bytes_per_pixel = 4;  // ARGB32 = 4 bytes per pixel.
 #endif
@@ skipping 479 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }