diff options
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 10 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.h | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 6d0b333..97ba400 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -298,6 +298,16 @@ void WebFrameLoaderClient::dispatchDidFinishLoading(DocumentLoader* loader, d->DidFinishLoading(webview, identifier); } +#if defined(OS_MACOSX) +// This is TEMPORARY until we can pull this upstream. TODO(avi): do it +NSCachedURLResponse* WebFrameLoaderClient::willCacheResponse( + WebCore::DocumentLoader*, + unsigned long identifier, + NSCachedURLResponse*) const { + return nil; +} +#endif + GURL WebFrameLoaderClient::GetAlt404PageUrl(DocumentLoader* loader) { WebViewImpl* webview = webframe_->webview_impl(); WebViewDelegate* d = webview->delegate(); diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h index 932ccdf..bb0e35d 100644 --- a/webkit/glue/webframeloaderclient_impl.h +++ b/webkit/glue/webframeloaderclient_impl.h @@ -9,6 +9,7 @@ #include "FrameLoaderClient.h" #pragma warning(pop) +#include "build/build_config.h" #include "googleurl/src/gurl.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/window_open_disposition.h" @@ -199,7 +200,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient { virtual void unloadListenerChanged(); -#if defined(__APPLE__) +#if defined(OS_MACOSX) // The above should have && !defined(BUILDING_CHROMIUM__) at the end but can't // for now, since we need to add that extra define all the way down to the // WebCore core. TODO(avi): Get that define into WebCore. |