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

Unified Diff: webkit/glue/webframe_impl.cc

Issue 14110: Move the "platform" wrappers in skia/ext to the skia namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years 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
« no previous file with comments | « webkit/glue/webframe_impl.h ('k') | webkit/glue/webview_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ||
« no previous file with comments | « webkit/glue/webframe_impl.h ('k') | webkit/glue/webview_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698