Attachment 373746 Details for Bug 199632 – Patch

[patch] Patch

bug-199632-20190709215519.patch (text/plain), 5.40 KB, created by Rob Buis on 2019-07-09 12:55:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-07-09 12:55:19 PDT

Size: 5.40 KB

patch

obsolete

>Subversion Revision: 247258
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5192537beda30a7a91b48fe51f9afe813c439205..041acf91c7f40bb6cdf3403271d496000ff7e883 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-07-09  Rob Buis  <rbuis@igalia.com>
>+
>+        Remove support for beforeload on link=prefetch
>+        https://bugs.webkit.org/show_bug.cgi?id=199632
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: fast/dom/HTMLLinkElement/prefetch-beforeload.html
>+
>+        * loader/LinkLoader.cpp:
>+        (WebCore::LinkLoader::prefetchIfNeeded):
>+        (WebCore::LinkLoader::loadLink):
>+
> 2019-07-09  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Remove InlineItem references from inline runs.
>diff --git a/Source/WebCore/loader/LinkLoader.cpp b/Source/WebCore/loader/LinkLoader.cpp
>index d638668e45c08809790a8881e10de605dcc2f881..6caf921fb41ad97b1f5f0135486919a2cbf05249 100644
>--- a/Source/WebCore/loader/LinkLoader.cpp
>+++ b/Source/WebCore/loader/LinkLoader.cpp
>@@ -283,7 +283,7 @@ std::unique_ptr<LinkPreloadResourceClient> LinkLoader::preloadIfNeeded(const Lin
> 
> void LinkLoader::prefetchIfNeeded(const LinkLoadParameters& params, Document& document)
> {
>-    if (!params.relAttribute.isLinkPrefetch || !params.href.isValid() || !document.frame() || !m_client.shouldLoadLink())
>+    if (!params.href.isValid() || !document.frame())
>         return;
> 
>     ASSERT(RuntimeEnabledFeatures::sharedFeatures().linkPrefetchEnabled());
>@@ -327,6 +327,11 @@ bool LinkLoader::loadLink(const LinkLoadParameters& params, Document& document)
> 
>     preconnectIfNeeded(params, document);
> 
>+    if (params.relAttribute.isLinkPrefetch) {
>+        prefetchIfNeeded(params, document);
>+        return true;
>+    }
>+
>     if (m_client.shouldLoadLink()) {
>         auto resourceClient = preloadIfNeeded(params, document, this);
>         if (m_preloadResourceClient)
>@@ -335,8 +340,6 @@ bool LinkLoader::loadLink(const LinkLoadParameters& params, Document& document)
>             m_preloadResourceClient = WTFMove(resourceClient);
>     }
> 
>-    prefetchIfNeeded(params, document);
>-
>     return true;
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fa6c56632ce0d9e4fecd64d478aee357c5d1ee71..28a025bac732b5ef58e702bc3c93f818b5961e27 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-07-09  Rob Buis  <rbuis@igalia.com>
>+
>+        Remove support for beforeload on link=prefetch
>+        https://bugs.webkit.org/show_bug.cgi?id=199632
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rewrite test so we expect onload to be called, not onbeforeload.
>+
>+        * TestExpectations:
>+        * fast/dom/HTMLLinkElement/prefetch-beforeload-expected.txt:
>+        * fast/dom/HTMLLinkElement/prefetch-beforeload.html:
>+
> 2019-07-09  Antti Koivisto  <antti@apple.com>
> 
>         REGRESSION(r244906): Crash in WebCore::positionOffsetValue
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 7b4fbd60cf80c1effd8224f692ef7b7503e8092d..f833a57ff76f1f5d8131d6ce99f7946e93563174 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -2334,7 +2334,6 @@ webkit.org/b/112755 fast/css3-text/css3-text-indent/getComputedStyle [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/link-and-subresource-test.html [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent.html [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch.html [ Skip ]
>-webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-beforeload.html [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-onerror.html [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-onload.html [ Skip ]
> webkit.org/b/3652 fast/dom/HTMLLinkElement/prefetch-too-many-clients.html [ Skip ]
>diff --git a/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload-expected.txt b/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload-expected.txt
>index c7fb01889c0824ab5515626e64071559d1f5bd6e..de82a2098035b5449393f1e17d92633cda9f0d5c 100644
>--- a/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload-expected.txt
>+++ b/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload-expected.txt
>@@ -1,2 +1,2 @@
>-PASS beforeload called
>+PASS load called
> This test will only print "PASS" or "FAIL" if link prefetches are enabled, otherwise it will show nothing below.
>diff --git a/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload.html b/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload.html
>index bb0da788ddd2202ddc720a353b6c330b0b1fbb26..82aceec846886ad272a88944cc57427ac43e2631 100644
>--- a/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload.html
>+++ b/LayoutTests/fast/dom/HTMLLinkElement/prefetch-beforeload.html
>@@ -3,12 +3,13 @@
> <script src="../../../resources/js-test-pre.js"></script>
> <script>
> if (window.testRunner) {
>+    testRunner.waitUntilDone();
>     testRunner.dumpAsText();
> }
> </script>
> <html>
> <p>This test will only print "PASS" or "FAIL" if link prefetches are
> enabled, otherwise it will show nothing below.</p>
>-<link href="prefetch.link" rel="prefetch" onbeforeload="testPassed('beforeload called');return false" onload="testFailed('onload')" onerror="testFailed('onerror')" />
>+<link href="prefetch.link" rel="prefetch" onbeforeload="testFailed('beforeload called');testRunner.notifyDone()" onload="testPassed('load called');testRunner.notifyDone()" onerror="testPassed('error called');testRunner.notifyDone()" />
> </html>
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199632: 373742 | 373746 | 373753 | 373768 | 373769 | 373907 | 373909 | 373910 | 373911 | 374008 | 374199