Changeset 215918 in webkit

Timestamp:

Apr 27, 2017 9:05:56 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Make navigation policy checking more robust
​https://bugs.webkit.org/show_bug.cgi?id=171409
<rdar://problem/31489248>

Reviewed by Geoffrey Garen.

No change in behavior. Just added a protectedThis to a lambda and made the functions non-copyable.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::willSendRequest):

• loader/PolicyCallback.cpp:

(WebCore::PolicyCallback::set):
(WebCore::PolicyCallback::clear): Deleted.

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

(WebCore::PolicyChecker::cancelCheck):
(WebCore::PolicyChecker::stopCheck):
(WebCore::PolicyChecker::continueAfterNavigationPolicy):
(WebCore::PolicyChecker::continueAfterNewWindowPolicy):
(WebCore::PolicyChecker::continueAfterContentPolicy):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-27  Alex Christensen  <achristensen@webkit.org>
+
+        Make navigation policy checking more robust
+        https://bugs.webkit.org/show_bug.cgi?id=171409
+        <rdar://problem/31489248>
+
+        Reviewed by Geoffrey Garen.
+
+        No change in behavior.  Just added a protectedThis to a lambda and made the functions non-copyable.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::willSendRequest):
+        * loader/PolicyCallback.cpp:
+        (WebCore::PolicyCallback::set):
+        (WebCore::PolicyCallback::clear): Deleted.
+        * loader/PolicyCallback.h:
+        * loader/PolicyChecker.cpp:
+        (WebCore::PolicyChecker::cancelCheck):
+        (WebCore::PolicyChecker::stopCheck):
+        (WebCore::PolicyChecker::continueAfterNavigationPolicy):
+        (WebCore::PolicyChecker::continueAfterNewWindowPolicy):
+        (WebCore::PolicyChecker::continueAfterContentPolicy):
+
 2017-04-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -568 +568 @@
     ASSERT(!m_waitingForNavigationPolicy);
     m_waitingForNavigationPolicy = true;
-    frameLoader()->policyChecker().checkNavigationPolicy(newRequest, didReceiveRedirectResponse, [this] (const ResourceRequest& request, FormState*, bool shouldContinue) {
+    frameLoader()->policyChecker().checkNavigationPolicy(newRequest, didReceiveRedirectResponse, [this, protectedThis = makeRef(*this)] (const ResourceRequest& request, FormState*, bool shouldContinue) {
         continueAfterNavigationPolicy(request, shouldContinue);
     });

trunk/Source/WebCore/loader/PolicyCallback.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-void PolicyCallback::clear()
-{
-    clearRequest();
-    m_navigationFunction = nullptr;
-    m_newWindowFunction = nullptr;
-    m_contentFunction = nullptr;
-}
-
-void PolicyCallback::set(const ResourceRequest& request, FormState* formState,
-    NavigationPolicyDecisionFunction function)
+void PolicyCallback::set(const ResourceRequest& request, FormState* formState, NavigationPolicyDecisionFunction&& function)
 {
     m_request = request;
@@ -59 +50 @@
 }
 
-void PolicyCallback::set(const ResourceRequest& request, FormState* formState, const String& frameName, const NavigationAction& navigationAction, NewWindowPolicyDecisionFunction function)
+void PolicyCallback::set(const ResourceRequest& request, FormState* formState, const String& frameName, const NavigationAction& navigationAction, NewWindowPolicyDecisionFunction&& function)
 {
     m_request = request;
@@ -71 +62 @@
 }
 
-void PolicyCallback::set(ContentPolicyDecisionFunction function)
+void PolicyCallback::set(ContentPolicyDecisionFunction&& function)
 {
     m_request = ResourceRequest();

trunk/Source/WebCore/loader/PolicyCallback.h

@@ -34 +34 @@
 #include "ResourceRequest.h"
 #include <functional>
+#include <wtf/Function.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -41 +42 @@
 class FormState;
 
-using ContentPolicyDecisionFunction = std::function<void(PolicyAction)>;
-using NavigationPolicyDecisionFunction = std::function<void(const ResourceRequest&, FormState*, bool shouldContinue)>;
-using NewWindowPolicyDecisionFunction = std::function<void(const ResourceRequest&, FormState*, const String& frameName, const NavigationAction&, bool shouldContinue)>;
+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)>;
 
 class PolicyCallback {
 public:
-    void clear();
-    void set(const ResourceRequest&, FormState*, NavigationPolicyDecisionFunction);
-    void set(const ResourceRequest&, FormState*, const String& frameName, const NavigationAction&, NewWindowPolicyDecisionFunction);
-    void set(ContentPolicyDecisionFunction);
+    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; }

trunk/Source/WebCore/loader/PolicyChecker.cpp

@@ -178 +178 @@
 {
     m_frame.loader().client().cancelPolicyCheck();
-    m_callback.clear();
+    m_callback = { };
 }
 
@@ -184 +184 @@
 {
     m_frame.loader().client().cancelPolicyCheck();
-    PolicyCallback callback = m_callback;
-    m_callback.clear();
+    PolicyCallback callback = WTFMove(m_callback);
     callback.cancel();
 }
@@ -203 +202 @@
 void PolicyChecker::continueAfterNavigationPolicy(PolicyAction policy)
 {
-    PolicyCallback callback = m_callback;
-    m_callback.clear();
+    PolicyCallback callback = WTFMove(m_callback);
 
     bool shouldContinue = policy == PolicyUse;
@@ -236 +234 @@
 void PolicyChecker::continueAfterNewWindowPolicy(PolicyAction policy)
 {
-    PolicyCallback callback = m_callback;
-    m_callback.clear();
+    PolicyCallback callback = WTFMove(m_callback);
 
     switch (policy) {
@@ -256 +253 @@
 void PolicyChecker::continueAfterContentPolicy(PolicyAction policy)
 {
-    PolicyCallback callback = m_callback;
-    m_callback.clear();
+    PolicyCallback callback = WTFMove(m_callback);
     callback.call(policy);
 }