Changeset 229304 in webkit

Timestamp:

Mar 5, 2018 7:13:32 PM (6 years ago)

Author:

Chris Dumez

Message:

fast/loader/onload-policy-ignore-for-frame.html is timing out with async policy delegates
​https://bugs.webkit.org/show_bug.cgi?id=183337

Reviewed by Ryosuke Niwa.

Source/WebCore:

Make sure we call checkCompleted() before calling checkLoadComplete() in
FrameLoader::continueLoadAfterNavigationPolicy() when the client tells us
to ignore the navigation, so that we properly recognize that the load is
done. This matches what is already done in FrameLoader::receivedMainResourceError().

Test: fast/loader/onload-policy-ignore-for-frame-async-delegates.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):

LayoutTests:

Add layout test coverage.

• fast/loader/onload-policy-ignore-for-frame-async-delegates-expected.txt: Added.
• fast/loader/onload-policy-ignore-for-frame-async-delegates.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/onload-policy-ignore-for-frame-async-delegates-expected.txt (added)
• LayoutTests/fast/loader/onload-policy-ignore-for-frame-async-delegates.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-05  Chris Dumez  <cdumez@apple.com>
+
+        fast/loader/onload-policy-ignore-for-frame.html is timing out with async policy delegates
+        https://bugs.webkit.org/show_bug.cgi?id=183337
+
+        Reviewed by Ryosuke Niwa.
+
+        Add layout test coverage.
+
+        * fast/loader/onload-policy-ignore-for-frame-async-delegates-expected.txt: Added.
+        * fast/loader/onload-policy-ignore-for-frame-async-delegates.html: Added.
+
 2018-03-05  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-05  Chris Dumez  <cdumez@apple.com>
+
+        fast/loader/onload-policy-ignore-for-frame.html is timing out with async policy delegates
+        https://bugs.webkit.org/show_bug.cgi?id=183337
+
+        Reviewed by Ryosuke Niwa.
+
+        Make sure we call checkCompleted() before calling checkLoadComplete() in
+        FrameLoader::continueLoadAfterNavigationPolicy() when the client tells us
+        to ignore the navigation, so that we properly recognize that the load is
+        done. This matches what is already done in FrameLoader::receivedMainResourceError().
+
+        Test: fast/loader/onload-policy-ignore-for-frame-async-delegates.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+
 2018-03-05  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3160 +3160 @@
 
         setPolicyDocumentLoader(nullptr);
+        checkCompleted();
         checkLoadComplete();
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -1322 +1322 @@
     }
 
-    if (injectedBundle.testRunner()->shouldDecideNavigationPolicyAfterDelay())
-        return WKBundlePagePolicyActionPassThrough;
-
     if (!injectedBundle.testRunner()->isPolicyDelegateEnabled()) {
         WKRetainPtr<WKStringRef> downloadAttributeRef(AdoptWK, WKBundleNavigationActionCopyDownloadAttribute(navigationAction));
@@ -1354 +1351 @@
     stringBuilder.append('\n');
     injectedBundle.outputText(stringBuilder.toString());
+
+    if (injectedBundle.testRunner()->shouldDecideNavigationPolicyAfterDelay())
+        return WKBundlePagePolicyActionPassThrough;
+
     injectedBundle.testRunner()->notifyDone();