Changeset 221228 in webkit

Timestamp:

Aug 26, 2017, 9:58:22 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Remove PolicyChecker::cancelCheck
​https://bugs.webkit.org/show_bug.cgi?id=176002

Patch by Alex Christensen <​achristensen@webkit.org> on 2017-08-26
Reviewed by Darin Adler.

cancelCheck is conceptually equivalent to not calling a completion handler.
stopCheck is conceptually equivalent to calling a completion handler with PolicyIgnore just before cleaning up everything,
which is semantically cleaner and necessary when I replace the last use of PolicyCallback with a CompletionHandler.
Before this change, we were probably causing some loading objects to hang right before deleting them, and this cleans them up better.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::cancelPolicyCheckIfNeeded):

• loader/PolicyChecker.cpp:

(WebCore::PolicyChecker::cancelCheck): Deleted.

• loader/PolicyChecker.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/PolicyChecker.cpp (modified) (1 diff)
• loader/PolicyChecker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-26  Alex Christensen  <achristensen@webkit.org>
+
+        Remove PolicyChecker::cancelCheck
+        https://bugs.webkit.org/show_bug.cgi?id=176002
+
+        Reviewed by Darin Adler.
+
+        cancelCheck is conceptually equivalent to not calling a completion handler.
+        stopCheck is conceptually equivalent to calling a completion handler with PolicyIgnore just before cleaning up everything,
+        which is semantically cleaner and necessary when I replace the last use of PolicyCallback with a CompletionHandler.
+        Before this change, we were probably causing some loading objects to hang right before deleting them, and this cleans them up better.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::cancelPolicyCheckIfNeeded):
+        * loader/PolicyChecker.cpp:
+        (WebCore::PolicyChecker::cancelCheck): Deleted.
+        * loader/PolicyChecker.h:
+
 2017-08-26  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1539 +1539 @@
 
     if (m_waitingForContentPolicy || m_waitingForNavigationPolicy) {
-        frameLoader()->policyChecker().cancelCheck();
+        frameLoader()->policyChecker().stopCheck();
         m_waitingForContentPolicy = false;
         m_waitingForNavigationPolicy = false;

trunk/Source/WebCore/loader/PolicyChecker.cpp

@@ -178 +178 @@
 }
 
-void PolicyChecker::cancelCheck()
-{
-    m_frame.loader().client().cancelPolicyCheck();
-    m_callback = { };
-}
-
 void PolicyChecker::stopCheck()
 {

trunk/Source/WebCore/loader/PolicyChecker.h

@@ -60 +60 @@
     void checkNewWindowPolicy(NavigationAction&&, const ResourceRequest&, FormState*, const String& frameName, NewWindowPolicyDecisionFunction);
 
-    // FIXME: These are different.  They could use better names.
-    void cancelCheck();
     void stopCheck();