diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/loader/FrameLoaderClient.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/loader/FrameLoaderClient.h')
| -rw-r--r-- | Source/WebCore/loader/FrameLoaderClient.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/loader/FrameLoaderClient.h b/Source/WebCore/loader/FrameLoaderClient.h index e97c1e0..4a0bcbf 100644 --- a/Source/WebCore/loader/FrameLoaderClient.h +++ b/Source/WebCore/loader/FrameLoaderClient.h @@ -152,7 +152,7 @@ namespace WebCore { virtual Frame* dispatchCreatePage(const NavigationAction&) = 0; virtual void dispatchShow() = 0; - virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&) = 0; + virtual void dispatchDecidePolicyForResponse(FramePolicyFunction, const ResourceResponse&, const ResourceRequest&) = 0; virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName) = 0; virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) = 0; virtual void cancelPolicyCheck() = 0; @@ -187,9 +187,11 @@ namespace WebCore { virtual void updateGlobalHistoryRedirectLinks() = 0; virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0; + virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const = 0; virtual void dispatchDidAddBackForwardItem(HistoryItem*) const = 0; virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const = 0; virtual void dispatchDidChangeBackForwardIndex() const = 0; + virtual void updateGlobalHistoryItemForPage() { } // This frame has displayed inactive content (such as an image) from an // insecure source. Inactive content cannot spread to other frames. @@ -307,6 +309,8 @@ namespace WebCore { virtual void didNotAllowPlugins() { } virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() = 0; + + virtual bool shouldPaintBrokenImage(const KURL&) const { return true; } }; } // namespace WebCore |