Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: content/renderer/webplugin_delegate_proxy.cc

Issue 7019013: Removal of dependencies on PlatformDevice classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Addressing comments. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/webplugin_delegate_proxy.cc
===================================================================
--- content/renderer/webplugin_delegate_proxy.cc (revision 85672)
+++ content/renderer/webplugin_delegate_proxy.cc (working copy)
@@ -850,8 +850,9 @@
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:
Jeff Timanus 2011/05/19 20:38:29 Done. I still kept the GetBitmapContext helper fu
+ &background_store_canvas_->getTopDevice());
+
DCHECK_EQ(CGBitmapContextGetBitsPerPixel(context),
CGBitmapContextGetBitsPerPixel(bg_context));
const unsigned char* bg_bytes = static_cast<const unsigned char*>(
@@ -869,9 +870,9 @@
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);

Powered by Google App Engine
This is Rietveld 408576698