Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

1 files changed, 5 insertions, 3 deletions

diff --git a/WebCore/loader/PolicyCallback.h b/WebCore/loader/PolicyCallback.h
index 757fff8..415a3e3 100644
--- a/WebCore/loader/PolicyCallback.h
+++ b/WebCore/loader/PolicyCallback.h
@@ -31,9 +31,10 @@
 #define PolicyCallback_h
 
 #include "FrameLoaderTypes.h"
-#include "PlatformString.h"
+#include "NavigationAction.h"
 #include "ResourceRequest.h"
 #include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -42,7 +43,7 @@ class FormState;
 typedef void (*NavigationPolicyDecisionFunction)(void* argument,
     const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue);
 typedef void (*NewWindowPolicyDecisionFunction)(void* argument,
-    const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, bool shouldContinue);
+    const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, const NavigationAction&, bool shouldContinue);
 typedef void (*ContentPolicyDecisionFunction)(void* argument, PolicyAction);
 
 class PolicyCallback {
@@ -53,7 +54,7 @@ public:
     void clear();
     void set(const ResourceRequest&, PassRefPtr<FormState>,
         NavigationPolicyDecisionFunction, void* argument);
-    void set(const ResourceRequest&, PassRefPtr<FormState>, const String& frameName,
+    void set(const ResourceRequest&, PassRefPtr<FormState>, const String& frameName, const NavigationAction&,
         NewWindowPolicyDecisionFunction, void* argument);
     void set(ContentPolicyDecisionFunction, void* argument);
 
@@ -68,6 +69,7 @@ private:
     ResourceRequest m_request;
     RefPtr<FormState> m_formState;
     String m_frameName;
+    NavigationAction m_navigationAction;
 
     NavigationPolicyDecisionFunction m_navigationFunction;
     NewWindowPolicyDecisionFunction m_newWindowFunction;