summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-16 13:46:42 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-16 13:46:42 +0000
commit8aa777462e5b19f936e82a33d3438100857499da (patch)
tree5496655f33253b3bbafd49ce4b5f8cc1dbeb6ac3 /webkit/glue
parent75ea01c8732f2a73facdbe660d15a7a6cceb23eb (diff)
downloadchromium_src-8aa777462e5b19f936e82a33d3438100857499da.zip
chromium_src-8aa777462e5b19f936e82a33d3438100857499da.tar.gz
chromium_src-8aa777462e5b19f936e82a33d3438100857499da.tar.bz2
Link fixing.
Review URL: http://codereview.chromium.org/2871 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webframe_impl.cc6
-rw-r--r--webkit/glue/webframeloaderclient_impl.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index f95daa1..17cc4cd 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1438,7 +1438,6 @@ void WebFrameImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) {
}
#if defined(OS_WIN)
-// TODO(pinkerton): waiting on bitmap re-factor from awalker
gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
// Must layout before painting.
Layout();
@@ -1455,6 +1454,11 @@ gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
device.fixupAlphaBeforeCompositing();
return device;
}
+#else
+// TODO(pinkerton): waiting on bitmap re-factor from awalker
+gfx::BitmapPlatformDevice WebFrameImpl::CaptureImage(bool scroll_to_zero) {
+ NOTIMPLEMENTED();
+}
#endif
bool WebFrameImpl::IsLoading() {
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index ecb9dc4..aa0acff 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -199,7 +199,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void unloadListenerChanged();
-#if defined(__APPLE__) && !defined(__BUILDING_CHROMIUM)
+#if defined(__APPLE__) && !defined(BUILDING_CHROMIUM__)
virtual NSCachedURLResponse* willCacheResponse(WebCore::DocumentLoader*,
unsigned long identifier,
NSCachedURLResponse*) const;