Merge webkit.org at R49305 : PolicyChecker is now factored out of FrameLoader.

See http://trac.webkit.org/changeset/49284

Change-Id: I2aafe6f747f22b9c51c0db60f13fb3352d373809

2 files changed, 9 insertions, 9 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index ff104d6..fa4e1d4 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -432,7 +432,7 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForMIMEType(FramePolicyFuncti
     if (!func)
         return;
     if (request.isNull()) {
-        (m_frame->loader()->*func)(PolicyIgnore);
+        (m_frame->loader()->policyChecker()->*func)(PolicyIgnore);
         return;
     }
     // Default to Use (display internally).
@@ -463,7 +463,7 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForMIMEType(FramePolicyFuncti
     WebCore::DocumentLoader* docLoader = m_frame->loader()->activeDocumentLoader();
     if (docLoader->response().httpStatusCode() == 204)
         action = PolicyIgnore;
-    (m_frame->loader()->*func)(action);
+    (m_frame->loader()->policyChecker()->*func)(action);
 }
 
 void FrameLoaderClientAndroid::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction func,
@@ -475,7 +475,7 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForNewWindowAction(FramePolic
         return;
 
     if (request.isNull()) {
-        (m_frame->loader()->*func)(PolicyIgnore);
+        (m_frame->loader()->policyChecker()->*func)(PolicyIgnore);
         return;
     }
 
@@ -486,9 +486,9 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForNewWindowAction(FramePolic
     // found by the frame tree. Instead of creating a new frame, return the
     // current frame in dispatchCreatePage.
     if (canHandleRequest(request))
-        (m_frame->loader()->*func)(PolicyUse);
+        (m_frame->loader()->policyChecker()->*func)(PolicyUse);
     else
-        (m_frame->loader()->*func)(PolicyIgnore);
+        (m_frame->loader()->policyChecker()->*func)(PolicyIgnore);
 }
 
 void FrameLoaderClientAndroid::cancelPolicyCheck() {
@@ -507,7 +507,7 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForNavigationAction(FramePoli
     if (!func)
         return;
     if (request.isNull()) {
-        (m_frame->loader()->*func)(PolicyIgnore);
+        (m_frame->loader()->policyChecker()->*func)(PolicyIgnore);
         return;
     }
 
@@ -520,14 +520,14 @@ void FrameLoaderClientAndroid::dispatchDecidePolicyForNavigationAction(FramePoli
         m_webFrame->decidePolicyForFormResubmission(func);
         return;
     } else {
-        (m_frame->loader()->*func)(PolicyUse);
+        (m_frame->loader()->policyChecker()->*func)(PolicyUse);
     }
 }
 
 void FrameLoaderClientAndroid::dispatchWillSubmitForm(FramePolicyFunction func, PassRefPtr<FormState>) {
     ASSERT(m_frame);
     ASSERT(func);
-    (m_frame->loader()->*func)(PolicyUse);
+    (m_frame->loader()->policyChecker()->*func)(PolicyUse);
 }
 
 void FrameLoaderClientAndroid::dispatchDidLoadMainResource(DocumentLoader*) {
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index ff5b9df..215df37 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -861,7 +861,7 @@ static void CallPolicyFunction(JNIEnv* env, jobject obj, jint func, jint decisio
     if (decision == WebCore::PolicyUse)
         pFrame->loader()->resetMultipleFormSubmissionProtection();
 
-    (pFrame->loader()->*(pFunc->func))((WebCore::PolicyAction)decision);
+    (pFrame->loader()->policyChecker()->*(pFunc->func))((WebCore::PolicyAction)decision);
 }
 
 static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAssetManager, jobject historyList)