Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / loader / FrameLoaderClient.h

diff --git a/src/third_party/WebKit/Source/core/loader/FrameLoaderClient.h b/src/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
index 55098fc..a8a1fef 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
+++ b/src/third_party/WebKit/Source/core/loader/FrameLoaderClient.h
@@ -50,7 +50,7 @@ class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 }
 
-namespace WebCore {
+namespace blink {
 
     class Color;
     class DOMWindowExtension;
@@ -90,7 +90,6 @@ namespace WebCore {
 
         virtual void detachedFromParent() = 0;
 
-        virtual void dispatchWillRequestAfterPreconnect(ResourceRequest&) { }
         virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0;
         virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&) = 0;
         virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier) = 0;
@@ -100,7 +99,7 @@ namespace WebCore {
         virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
         virtual void dispatchDidNavigateWithinPage(HistoryItem*, HistoryCommitType) { }
         virtual void dispatchWillClose() = 0;
-        virtual void dispatchDidStartProvisionalLoad() = 0;
+        virtual void dispatchDidStartProvisionalLoad(bool isTransitionNavigation) = 0;
         virtual void dispatchDidReceiveTitle(const String&) = 0;
         virtual void dispatchDidChangeIcons(IconType) = 0;
         virtual void dispatchDidCommitLoad(LocalFrame*, HistoryItem*, HistoryCommitType) = 0;
@@ -111,8 +110,9 @@ namespace WebCore {
         virtual void dispatchDidFirstVisuallyNonEmptyLayout() = 0;
         virtual void dispatchDidChangeThemeColor() = 0;
 
-        virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&, DocumentLoader*, NavigationPolicy) = 0;
+        virtual NavigationPolicy decidePolicyForNavigation(const ResourceRequest&, DocumentLoader*, NavigationPolicy, bool isTransitionNavigation) = 0;
 
+        virtual void dispatchAddNavigationTransitionData(const String& origin, const String& selector, const String& markup) { }
         virtual void dispatchWillRequestResource(FetchRequest*) { }
 
         virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) = 0;
@@ -176,11 +176,13 @@ namespace WebCore {
 
         virtual void didChangeScrollOffset() { }
         virtual void didUpdateCurrentHistoryItem() { }
+        virtual void didRemoveAllPendingStylesheet() { }
 
         virtual bool allowScript(bool enabledPerSettings) { return enabledPerSettings; }
         virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) { return enabledPerSettings; }
         virtual bool allowPlugins(bool enabledPerSettings) { return enabledPerSettings; }
         virtual bool allowImage(bool enabledPerSettings, const KURL&) { return enabledPerSettings; }
+        virtual bool allowMedia(const KURL&) { return true; }
         virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) { return enabledPerSettings; }
         virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, const KURL&) { return enabledPerSettings; }
 
@@ -230,6 +232,6 @@ namespace WebCore {
         virtual bool isFrameLoaderClientImpl() const { return false; }
     };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // FrameLoaderClient_h