diff options
author | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:47:00 +0000 |
---|---|---|
committer | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:47:00 +0000 |
commit | b49cbcf2cb1808755be7d629df962850756fe691 (patch) | |
tree | 66a1cbbeda98ff0a2be564fb164bbd274245aea8 /webkit/tools | |
parent | 6328338ef2dcd7fe075cb4065c644847d5330a71 (diff) | |
download | chromium_src-b49cbcf2cb1808755be7d629df962850756fe691.zip chromium_src-b49cbcf2cb1808755be7d629df962850756fe691.tar.gz chromium_src-b49cbcf2cb1808755be7d629df962850756fe691.tar.bz2 |
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 4 | ||||
-rw-r--r-- | webkit/tools/test_shell/webview_host.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/webwidget_host.cc | 4 | ||||
-rw-r--r-- | webkit/tools/test_shell/webwidget_host.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index cbe8561..a256646 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -39,7 +39,7 @@ #include "base/command_line.h" #include "base/debug_on_start.h" #include "base/file_util.h" -#include "base/gfx/bitmap_platform_device.h" +#include "base/gfx/bitmap_platform_device_win.h" #include "base/gfx/png_encoder.h" #include "base/gfx/size.h" #include "base/icu_util.h" @@ -542,7 +542,7 @@ void TestShell::ResizeSubViews() { /* static */ std::string TestShell::DumpImage( WebFrame* web_frame, const std::wstring& file_name) { - gfx::BitmapPlatformDevice device(web_frame->CaptureImage(true)); + gfx::BitmapPlatformDeviceWin device(web_frame->CaptureImage(true)); const SkBitmap& src_bmp = device.accessBitmap(false); // Encode image. diff --git a/webkit/tools/test_shell/webview_host.cc b/webkit/tools/test_shell/webview_host.cc index 61f66f0..ea59c14 100644 --- a/webkit/tools/test_shell/webview_host.cc +++ b/webkit/tools/test_shell/webview_host.cc @@ -29,7 +29,7 @@ #include "webkit/tools/test_shell/webview_host.h" -#include "base/gfx/platform_canvas.h" +#include "base/gfx/platform_canvas_win.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "base/win_util.h" diff --git a/webkit/tools/test_shell/webwidget_host.cc b/webkit/tools/test_shell/webwidget_host.cc index b037ca9..7b90c60 100644 --- a/webkit/tools/test_shell/webwidget_host.cc +++ b/webkit/tools/test_shell/webwidget_host.cc @@ -29,7 +29,7 @@ #include "webkit/tools/test_shell/webwidget_host.h" -#include "base/gfx/platform_canvas.h" +#include "base/gfx/platform_canvas_win.h" #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "base/win_util.h" @@ -227,7 +227,7 @@ void WebWidgetHost::Paint() { if (!canvas_.get()) { ResetScrollRect(); paint_rect_ = client_rect; - canvas_.reset(new gfx::PlatformCanvas( + canvas_.reset(new gfx::PlatformCanvasWin( paint_rect_.width(), paint_rect_.height(), true)); } diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h index e0dde64..fd4dd87 100644 --- a/webkit/tools/test_shell/webwidget_host.h +++ b/webkit/tools/test_shell/webwidget_host.h @@ -39,7 +39,7 @@ class WebWidget; class WebWidgetDelegate; namespace gfx { -class PlatformCanvas; +class PlatformCanvasWin; class Size; } @@ -91,7 +91,7 @@ class WebWidgetHost { HWND hwnd_; WebWidget* webwidget_; - scoped_ptr<gfx::PlatformCanvas> canvas_; + scoped_ptr<gfx::PlatformCanvasWin> canvas_; // specifies the portion of the webwidget that needs painting gfx::Rect paint_rect_; |