Changeset 221103 in webkit

Timestamp:

Aug 23, 2017 2:10:09 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Stop using PolicyChecker for ContentPolicy
​https://bugs.webkit.org/show_bug.cgi?id=175904

Reviewed by Tim Horton.

PolicyChecker is an artifact from the days before C++11. Now we have lambdas which
have a cleaner flow than one class that exists to be effectively one of three lambda types.
Let's remove them one at a time, starting with ContentPolicy checks.

No change in behaviour.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::responseReceived):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::checkContentPolicy):

• loader/FrameLoader.h:
• loader/PolicyCallback.cpp:

(WebCore::PolicyCallback::set):
(WebCore::PolicyCallback::call):
(WebCore::PolicyCallback::cancel):

• loader/PolicyCallback.h:
• loader/PolicyChecker.cpp:

(WebCore::PolicyChecker::checkContentPolicy): Deleted.
(WebCore::PolicyChecker::continueAfterContentPolicy): Deleted.

• loader/PolicyChecker.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/FrameLoader.h (modified) (2 diffs)
• loader/PolicyCallback.cpp (modified) (4 diffs)
• loader/PolicyCallback.h (modified) (4 diffs)
• loader/PolicyChecker.cpp (modified) (2 diffs)
• loader/PolicyChecker.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-23  Alex Christensen  <achristensen@webkit.org>
+
+        Stop using PolicyChecker for ContentPolicy
+        https://bugs.webkit.org/show_bug.cgi?id=175904
+
+        Reviewed by Tim Horton.
+
+        PolicyChecker is an artifact from the days before C++11.  Now we have lambdas which
+        have a cleaner flow than one class that exists to be effectively one of three lambda types.
+        Let's remove them one at a time, starting with ContentPolicy checks.
+        
+        No change in behaviour.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::responseReceived):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkContentPolicy):
+        * loader/FrameLoader.h:
+        * loader/PolicyCallback.cpp:
+        (WebCore::PolicyCallback::set):
+        (WebCore::PolicyCallback::call):
+        (WebCore::PolicyCallback::cancel):
+        * loader/PolicyCallback.h:
+        * loader/PolicyChecker.cpp:
+        (WebCore::PolicyChecker::checkContentPolicy): Deleted.
+        (WebCore::PolicyChecker::continueAfterContentPolicy): Deleted.
+        * loader/PolicyChecker.h:
+
 2017-08-23  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -705 +705 @@
 #endif
 
-    frameLoader()->policyChecker().checkContentPolicy(m_response, [this](PolicyAction policy) {
+    frameLoader()->checkContentPolicy(m_response, [this](PolicyAction policy) {
         continueAfterContentPolicy(policy);
     });

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -356 +356 @@
 }
 
+void FrameLoader::checkContentPolicy(const ResourceResponse& response, ContentPolicyDecisionFunction&& function)
+{
+    client().dispatchDecidePolicyForResponse(response, activeDocumentLoader()->request(), WTFMove(function));
+}
+
 void FrameLoader::changeLocation(FrameLoadRequest&& request)
 {

trunk/Source/WebCore/loader/FrameLoader.h

@@ -84 +84 @@
 WEBCORE_EXPORT bool isReload(FrameLoadType);
 
+using ContentPolicyDecisionFunction = WTF::Function<void(PolicyAction)>;
+
 class FrameLoader {
     WTF_MAKE_NONCOPYABLE(FrameLoader);
@@ -208 +210 @@
     void setDefersLoading(bool);
 
+    void checkContentPolicy(const ResourceResponse&, ContentPolicyDecisionFunction&&);
+
     void didExplicitOpen();
 

trunk/Source/WebCore/loader/PolicyCallback.cpp

@@ -47 +47 @@
     m_navigationFunction = WTFMove(function);
     m_newWindowFunction = nullptr;
-    m_contentFunction = nullptr;
 }
 
@@ -59 +58 @@
     m_navigationFunction = nullptr;
     m_newWindowFunction = WTFMove(function);
-    m_contentFunction = nullptr;
-}
-
-void PolicyCallback::set(ContentPolicyDecisionFunction&& function)
-{
-    m_request = ResourceRequest();
-    m_formState = nullptr;
-    m_frameName = String();
-
-    m_navigationFunction = nullptr;
-    m_newWindowFunction = nullptr;
-    m_contentFunction = WTFMove(function);
 }
 
@@ -79 +66 @@
     if (m_newWindowFunction)
         m_newWindowFunction(m_request, m_formState.get(), m_frameName, m_navigationAction, shouldContinue);
-    ASSERT(!m_contentFunction);
-}
-
-void PolicyCallback::call(PolicyAction action)
-{
-    ASSERT(!m_navigationFunction);
-    ASSERT(!m_newWindowFunction);
-    ASSERT(m_contentFunction);
-    m_contentFunction(action);
 }
 
@@ -104 +82 @@
     if (m_newWindowFunction)
         m_newWindowFunction(m_request, m_formState.get(), m_frameName, m_navigationAction, false);
-    if (m_contentFunction)
-        m_contentFunction(PolicyIgnore);
 }
 

trunk/Source/WebCore/loader/PolicyCallback.h

@@ -42 +42 @@
 class FormState;
 
-using ContentPolicyDecisionFunction = Function<void(PolicyAction)>;
 using NavigationPolicyDecisionFunction = Function<void(const ResourceRequest&, FormState*, bool shouldContinue)>;
 using NewWindowPolicyDecisionFunction = Function<void(const ResourceRequest&, FormState*, const String& frameName, const NavigationAction&, bool shouldContinue)>;
@@ -50 +49 @@
     void set(const ResourceRequest&, FormState*, NavigationPolicyDecisionFunction&&);
     void set(const ResourceRequest&, FormState*, const String& frameName, const NavigationAction&, NewWindowPolicyDecisionFunction&&);
-    void set(ContentPolicyDecisionFunction&&);
 
     const ResourceRequest& request() const { return m_request; }
@@ -56 +54 @@
 
     void call(bool shouldContinue);
-    void call(PolicyAction);
     void cancel();
 
@@ -67 +64 @@
     NavigationPolicyDecisionFunction m_navigationFunction;
     NewWindowPolicyDecisionFunction m_newWindowFunction;
-    ContentPolicyDecisionFunction m_contentFunction;
 };
 

trunk/Source/WebCore/loader/PolicyChecker.cpp

@@ -168 +168 @@
 }
 
-void PolicyChecker::checkContentPolicy(const ResourceResponse& response, ContentPolicyDecisionFunction function)
-{
-    m_callback.set(WTFMove(function));
-    m_frame.loader().client().dispatchDecidePolicyForResponse(response, m_frame.loader().activeDocumentLoader()->request(), [this](PolicyAction action) {
-        continueAfterContentPolicy(action);
-    });
-}
-
 void PolicyChecker::cancelCheck()
 {
@@ -252 +244 @@
 }
 
-void PolicyChecker::continueAfterContentPolicy(PolicyAction policy)
-{
-    PolicyCallback callback = WTFMove(m_callback);
-    callback.call(policy);
-}
-
 void PolicyChecker::handleUnimplementablePolicy(const ResourceError& error)
 {

trunk/Source/WebCore/loader/PolicyChecker.h

@@ -57 +57 @@
     void checkNavigationPolicy(const ResourceRequest&, bool didReceiveRedirectResponse, NavigationPolicyDecisionFunction);
     void checkNewWindowPolicy(const NavigationAction&, const ResourceRequest&, FormState*, const String& frameName, NewWindowPolicyDecisionFunction);
-    void checkContentPolicy(const ResourceResponse&, ContentPolicyDecisionFunction);
 
     // FIXME: These are different.  They could use better names.
@@ -87 +86 @@
     void continueAfterNavigationPolicy(PolicyAction);
     void continueAfterNewWindowPolicy(PolicyAction);
-    void continueAfterContentPolicy(PolicyAction);
 
     void handleUnimplementablePolicy(const ResourceError&);