diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 16:13:00 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 16:13:00 +0000 |
| commit | 8240fca6ad234d1dce76986084aeac9fffd4f1be (patch) | |
| tree | 8bc86ced6c60c9fbccf60dda7198d18a99f6f8ac /webkit | |
| parent | b92097c486a7478c2a5c33239b06658f993ba22a (diff) | |
| download | chromium_src-8240fca6ad234d1dce76986084aeac9fffd4f1be.zip chromium_src-8240fca6ad234d1dce76986084aeac9fffd4f1be.tar.gz chromium_src-8240fca6ad234d1dce76986084aeac9fffd4f1be.tar.bz2 | |
Fix bustage in r2110; fix the return type
Review URL: http://codereview.chromium.org/3007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index e9954cd..f95daa1 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -1439,7 +1439,7 @@ void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) { #if defined(OS_WIN) // TODO(pinkerton): waiting on bitmap re-factor from awalker -gfx::BitmapPlatformDeviceWin WebFrameImpl::CaptureImage(bool scroll_to_zero) { +gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) { // Must layout before painting. Layout(); diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index 79ffe33..53cea39 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -108,7 +108,7 @@ class WebFrameImpl : public WebFrame { virtual WebFrame* GetParent() const; virtual WebFrame* GetChildFrame(const std::wstring& xpath) const; virtual WebView* GetView() const; - virtual gfx::BitmapPlatformDeviceWin CaptureImage(bool scroll_to_zero); + virtual gfx::BitmapPlatformDevice CaptureImage(bool scroll_to_zero); // This method calls createRuntimeObject (in KJS::Bindings::Instance), which // increments the refcount of the NPObject passed in. |