Changeset 229585 in webkit

Timestamp:

Mar 13, 2018 1:39:17 PM (6 years ago)

Author:

youenn@apple.com

Message:

Changing link element rel attribute from preload to stylesheet should succeed loading the stylesheet
​https://bugs.webkit.org/show_bug.cgi?id=183601
<rdar://problem/38309441>

Reviewed by Antti Koivisto.

Source/WebCore:

Test: http/wpt/preload/change-link-rel-attribute.html

• loader/LinkPreloadResourceClients.h:

(WebCore::LinkPreloadResourceClient::clearResource): Remove the call to CachedResource::cancelLoad.
This call is expected to be called by ResourceLoader when cancelling the load from below CachedResource.

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::allClientsRemoved): In case of preload,
cancel the load if not finished when there is no more client attached to it.

• loader/cache/CachedResource.h:

LayoutTests:

• http/wpt/preload/change-link-rel-attribute-expected.txt: Added.
• http/wpt/preload/change-link-rel-attribute.html: Added.
• http/wpt/preload/resources/style.css: Added.

(body):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/preload/change-link-rel-attribute-expected.txt (added)
• LayoutTests/http/wpt/preload/change-link-rel-attribute.html (added)
• LayoutTests/http/wpt/preload/resources/style.css (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/LinkPreloadResourceClients.h (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-13  Youenn Fablet  <youenn@apple.com>
+
+        Changing link element rel attribute from preload to stylesheet should succeed loading the stylesheet
+        https://bugs.webkit.org/show_bug.cgi?id=183601
+        <rdar://problem/38309441>
+
+        Reviewed by Antti Koivisto.
+
+        * http/wpt/preload/change-link-rel-attribute-expected.txt: Added.
+        * http/wpt/preload/change-link-rel-attribute.html: Added.
+        * http/wpt/preload/resources/style.css: Added.
+        (body):
+
 2018-03-13  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-13  Youenn Fablet  <youenn@apple.com>
+
+        Changing link element rel attribute from preload to stylesheet should succeed loading the stylesheet
+        https://bugs.webkit.org/show_bug.cgi?id=183601
+        <rdar://problem/38309441>
+
+        Reviewed by Antti Koivisto.
+
+        Test: http/wpt/preload/change-link-rel-attribute.html
+
+        * loader/LinkPreloadResourceClients.h:
+        (WebCore::LinkPreloadResourceClient::clearResource): Remove the call to CachedResource::cancelLoad.
+        This call is expected to be called by ResourceLoader when cancelling the load from below CachedResource.
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::allClientsRemoved): In case of preload,
+        cancel the load if not finished when there is no more client attached to it.
+        * loader/cache/CachedResource.h:
+
 2018-03-12  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/loader/LinkPreloadResourceClients.h

@@ -63 +63 @@
     void clearResource(CachedResourceClient& client)
     {
-        if (m_resource) {
-            m_resource->cancelLoad();
-            m_resource->removeClient(client);
-        }
+        if (!m_resource)
+            return;
+
+        m_resource->removeClient(client);
         m_resource = nullptr;
     }

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -580 +580 @@
 }
 
+void CachedResource::allClientsRemoved()
+{
+    if (isLinkPreload() && m_loader)
+        m_loader->cancelIfNotFinishing();
+}
+
 void CachedResource::destroyDecodedDataIfNeeded()
 {

trunk/Source/WebCore/loader/cache/CachedResource.h

@@ -142 +142 @@
     virtual void didAddClient(CachedResourceClient&);
     virtual void didRemoveClient(CachedResourceClient&) { }
-    virtual void allClientsRemoved() { }
+    virtual void allClientsRemoved();
     void destroyDecodedDataIfNeeded();