Index: webkit/glue/webframe_impl.cc |
=================================================================== |
--- webkit/glue/webframe_impl.cc (revision 6968) |
+++ webkit/glue/webframe_impl.cc (working copy) |
@@ -1413,7 +1413,7 @@ |
FromFrame(child)->Layout(); |
} |
-void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) { |
+void WebFrameImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) { |
static StatsRate rendering("WebFramePaintTime"); |
StatsScope<StatsRate> rendering_scope(rendering); |
@@ -1436,7 +1436,7 @@ |
} |
} |
-bool WebFrameImpl::CaptureImage(scoped_ptr<gfx::BitmapPlatformDevice>* image, |
+bool WebFrameImpl::CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image, |
bool scroll_to_zero) { |
if (!image) { |
NOTREACHED(); |
@@ -1446,7 +1446,7 @@ |
// Must layout before painting. |
Layout(); |
- gfx::PlatformCanvas canvas; |
+ skia::PlatformCanvas canvas; |
if (!canvas.initialize(frameview()->width(), frameview()->height(), true)) |
return false; |
@@ -1463,14 +1463,14 @@ |
canvas.endPlatformPaint(); |
#endif |
- gfx::BitmapPlatformDevice& device = |
- static_cast<gfx::BitmapPlatformDevice&>(canvas.getTopPlatformDevice()); |
+ skia::BitmapPlatformDevice& device = |
+ static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice()); |
#if defined(OS_WIN) |
device.fixupAlphaBeforeCompositing(); |
#endif |
- image->reset(new gfx::BitmapPlatformDevice(device)); |
+ image->reset(new skia::BitmapPlatformDevice(device)); |
return true; |
} |
@@ -1773,7 +1773,7 @@ |
*page_size = webkit_glue::FromIntRect(pages_[page]); |
} |
-bool WebFrameImpl::SpoolPage(int page, gfx::PlatformCanvas* canvas) { |
+bool WebFrameImpl::SpoolPage(int page, skia::PlatformCanvas* canvas) { |
// Ensure correct state. |
if (!printing_ || |
page < 0 || |