diff options
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/mac/webwidget_host.mm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | webkit/tools/test_shell/webwidget_host_gtk.cc | 12 | ||||
| -rw-r--r-- | webkit/tools/test_shell/webwidget_host_win.cc | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index 4daf57f..eb23bc1 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -6,7 +6,7 @@ #include "webkit/tools/test_shell/webwidget_host.h" -#include "base/gfx/platform_canvas_mac.h" +#include "base/gfx/platform_canvas.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "base/logging.h" diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc index 4b66004..dd5b311 100644..100755 --- a/webkit/tools/test_shell/webwidget_host_gtk.cc +++ b/webkit/tools/test_shell/webwidget_host_gtk.cc @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "skia/ext/bitmap_platform_device_linux.h" -#include "skia/ext/platform_canvas_linux.h" -#include "skia/ext/platform_device_linux.h" +#include "skia/ext/bitmap_platform_device.h" +#include "skia/ext/platform_canvas.h" +#include "skia/ext/platform_device.h" #include "webkit/api/public/gtk/WebInputEventFactory.h" #include "webkit/api/public/x11/WebScreenInfoFactory.h" #include "webkit/api/public/WebInputEvent.h" @@ -357,9 +357,9 @@ void WebWidgetHost::Paint() { gdk_window_begin_paint_rect(window, &grect); // BitBlit to the gdk window. - skia::PlatformDeviceLinux &platdev = canvas_->getTopPlatformDevice(); - skia::BitmapPlatformDeviceLinux* const bitdev = - static_cast<skia::BitmapPlatformDeviceLinux* >(&platdev); + skia::PlatformDevice& platdev = canvas_->getTopPlatformDevice(); + skia::BitmapPlatformDevice* const bitdev = + static_cast<skia::BitmapPlatformDevice*>(&platdev); cairo_t* cairo_drawable = gdk_cairo_create(window); cairo_set_source_surface(cairo_drawable, bitdev->surface(), 0, 0); cairo_paint(cairo_drawable); diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc index 44fd523..164a051 100644 --- a/webkit/tools/test_shell/webwidget_host_win.cc +++ b/webkit/tools/test_shell/webwidget_host_win.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" -#include "skia/ext/platform_canvas_win.h" #include "webkit/api/public/WebInputEvent.h" #include "webkit/api/public/WebScreenInfo.h" #include "webkit/api/public/WebSize.h" |