Attachment 340204 Details for Bug 185553 – patch

[patch] patch

link-preload-client-remove.patch (text/plain), 3.48 KB, created by Antti Koivisto on 2018-05-11 11:03:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-05-11 11:03:14 PDT

Size: 3.48 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 231707)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-05-11  Antti Koivisto  <antti@apple.com>
>+
>+        LinkLoader fails to remove CachedResourceClient in some cases
>+        https://bugs.webkit.org/show_bug.cgi?id=185553
>+        <rdar://problem/36879656>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: http/tests/preload/link-preload-client-remove.html
>+
>+        * loader/LinkLoader.cpp:
>+        (WebCore::LinkLoader::loadLink):
>+
>+        If there is a link preload already in progress, we fail to clear the client for the ongoing load.
>+        This may leave the CachedResource client map in a bad state.
>+
> 2018-05-11  Brady Eidson  <beidson@apple.com>
> 
>         Make sure history navigations reuse the existing process when necessary.
>Index: Source/WebCore/loader/LinkLoader.cpp
>===================================================================
>--- Source/WebCore/loader/LinkLoader.cpp	(revision 231553)
>+++ Source/WebCore/loader/LinkLoader.cpp	(working copy)
>@@ -301,10 +301,10 @@ bool LinkLoader::loadLink(const LinkRelA
> 
>     if (m_client.shouldLoadLink()) {
>         auto resourceClient = preloadIfNeeded(relAttribute, href, document, as, media, mimeType, crossOrigin, this);
>+        if (m_preloadResourceClient)
>+            m_preloadResourceClient->clear();
>         if (resourceClient)
>             m_preloadResourceClient = WTFMove(resourceClient);
>-        else if (m_preloadResourceClient)
>-            m_preloadResourceClient->clear();
>     }
> 
>     prefetchIfNeeded(relAttribute, href, document);
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 231553)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-05-11  Antti Koivisto  <antti@apple.com>
>+
>+        LinkLoader fails to remove CachedResourceClient in some cases
>+        https://bugs.webkit.org/show_bug.cgi?id=185553
>+        <rdar://problem/36879656>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/preload/link-preload-client-remove-expected.txt: Added.
>+        * http/tests/preload/link-preload-client-remove.html: Added.
>+
> 2018-05-09  Dominik Infuehr  <dinfuehr@igalia.com>
> 
>         [ARM] Disable test on Linux due to lack of executable memory
>Index: LayoutTests/http/tests/preload/link-preload-client-remove-expected.txt
>===================================================================
>--- LayoutTests/http/tests/preload/link-preload-client-remove-expected.txt	(nonexistent)
>+++ LayoutTests/http/tests/preload/link-preload-client-remove-expected.txt	(working copy)
>@@ -0,0 +1 @@
>+Test that restarting link preload doesn't assert or crash.
>Index: LayoutTests/http/tests/preload/link-preload-client-remove.html
>===================================================================
>--- LayoutTests/http/tests/preload/link-preload-client-remove.html	(nonexistent)
>+++ LayoutTests/http/tests/preload/link-preload-client-remove.html	(working copy)
>@@ -0,0 +1,17 @@
>+<!DOCTYPE html>
>+<script>
>+if (window.testRunner) {
>+    testRunner.dumpAsText()
>+    testRunner.waitUntilDone();
>+    window.addEventListener("load", function() {
>+        testRunner.notifyDone();
>+    });
>+}
>+</script>
>+<link id=link rel=preload href="../resources/dummy.js" as=fetch>
>+<body>
>+Test that restarting link preload doesn't assert or crash.
>+</body>
>+<script>
>+link.setAttribute("rel", "preload");
>+</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 185553: 340204