summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 17:06:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 17:06:53 +0000
commit7f1fe3fad451d8809d94b19fca516a2a2134e38c (patch)
tree6954e9cf8f4bd15293f8088b4f1ae51ffd48b5bb /webkit/tools
parent44df75248693160a9e677690f0a51e9ba3ce3b32 (diff)
downloadchromium_src-7f1fe3fad451d8809d94b19fca516a2a2134e38c.zip
chromium_src-7f1fe3fad451d8809d94b19fca516a2a2134e38c.tar.gz
chromium_src-7f1fe3fad451d8809d94b19fca516a2a2134e38c.tar.bz2
Keep the cairo clipping region in sync with the Skia one.
The PlatformCanvas now tracks this, so we don't need to have the similar code in gfx::Canvas. I moved most references of cairo_surface_t to cairo_t since the cairo_t has a transform and clip but the surface does not. Review URL: http://codereview.chromium.org/149409 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index dd5b311..9703213 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -357,11 +357,10 @@ void WebWidgetHost::Paint() {
gdk_window_begin_paint_rect(window, &grect);
// BitBlit to the gdk window.
- skia::PlatformDevice& platdev = canvas_->getTopPlatformDevice();
- skia::BitmapPlatformDevice* const bitdev =
- static_cast<skia::BitmapPlatformDevice*>(&platdev);
+ cairo_t* source_surface = canvas_->beginPlatformPaint();
cairo_t* cairo_drawable = gdk_cairo_create(window);
- cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0);
+ cairo_set_source_surface(cairo_drawable, cairo_get_target(source_surface),
+ 0, 0);
cairo_paint(cairo_drawable);
cairo_destroy(cairo_drawable);