Changeset 216143 in webkit

Timestamp:

May 3, 2017 2:55:25 PM (7 years ago)

Author:

yoav@yoav.ws

Message:

Link preload HTMLPreloadScanner support
​https://bugs.webkit.org/show_bug.cgi?id=170747

Reviewed by Youenn Fablet.

Source/WebCore:

Test: http/tests/preload/preloadscanner_download_resources.html

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner): Initialize link preload flag.
(WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest): Create a request only if the type is known (so ignore
preloads with unknown type).
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Add handling for link preload and the as attribute.
(WebCore::TokenPreloadScanner::StartTagScanner::relAttributeIsStyleSheet): Get LinkRelAttribute as input.
(WebCore::TokenPreloadScanner::StartTagScanner::resourceType): Return an std::optional, in case the preload type is unknown.
(WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload): Return true for the link preload case.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::preload): Return the resource rather than a nullptr if it's already in m_preloads.

LayoutTests:

• http/tests/preload/preloadscanner_download_resources-expected.txt: Added.
• http/tests/preload/preloadscanner_download_resources.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/preload/preloadscanner_download_resources-expected.txt (added)
• LayoutTests/http/tests/preload/preloadscanner_download_resources.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (10 diffs)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-03  Yoav Weiss  <yoav@yoav.ws>
+
+        Link preload HTMLPreloadScanner support
+        https://bugs.webkit.org/show_bug.cgi?id=170747
+
+        Reviewed by Youenn Fablet.
+
+        * http/tests/preload/preloadscanner_download_resources-expected.txt: Added.
+        * http/tests/preload/preloadscanner_download_resources.html: Added.
+
 2017-05-03  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-03  Yoav Weiss  <yoav@yoav.ws>
+
+        Link preload HTMLPreloadScanner support
+        https://bugs.webkit.org/show_bug.cgi?id=170747
+
+        Reviewed by Youenn Fablet.
+
+        Test: http/tests/preload/preloadscanner_download_resources.html
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner): Initialize link preload flag.
+        (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest): Create a request only if the type is known (so ignore
+        preloads with unknown type).
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Add handling for link preload and the `as` attribute.
+        (WebCore::TokenPreloadScanner::StartTagScanner::relAttributeIsStyleSheet): Get LinkRelAttribute as input.
+        (WebCore::TokenPreloadScanner::StartTagScanner::resourceType): Return an std::optional, in case the preload type is unknown.
+        (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload): Return true for the link preload case.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::preload): Return the resource rather than a nullptr if it's already in m_preloads.
+
 2017-05-03  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -34 +34 @@
 #include "HTMLTokenizer.h"
 #include "InputTypeNames.h"
+#include "LinkLoader.h"
 #include "LinkRelAttribute.h"
 #include "MediaList.h"
@@ -101 +102 @@
         : m_tagId(tagId)
         , m_linkIsStyleSheet(false)
+        , m_linkIsPreload(false)
         , m_metaIsViewport(false)
         , m_inputIsImage(false)
@@ -145 +147 @@
             return nullptr;
 
-        auto request = std::make_unique<PreloadRequest>(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, resourceType(), m_mediaAttribute, m_moduleScript);
+        auto type = resourceType();
+        if (!type)
+            return nullptr;
+        auto request = std::make_unique<PreloadRequest>(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, type.value(), m_mediaAttribute, m_moduleScript);
         request->setCrossOriginMode(m_crossOriginMode);
         request->setNonce(m_nonceAttribute);
@@ -221 +226 @@
             if (match(attributeName, hrefAttr))
                 setUrlToLoad(attributeValue);
-            else if (match(attributeName, relAttr))
-                m_linkIsStyleSheet = relAttributeIsStyleSheet(attributeValue);
-            else if (match(attributeName, mediaAttr))
+            else if (match(attributeName, relAttr)) {
+                LinkRelAttribute parsedAttribute { attributeValue };
+                m_linkIsStyleSheet = relAttributeIsStyleSheet(parsedAttribute);
+                m_linkIsPreload = parsedAttribute.isLinkPreload;
+            } else if (match(attributeName, mediaAttr))
                 m_mediaAttribute = attributeValue;
             else if (match(attributeName, charsetAttr))
@@ -231 +238 @@
             else if (match(attributeName, nonceAttr))
                 m_nonceAttribute = attributeValue;
+            else if (match(attributeName, asAttr))
+                m_asAttribute = attributeValue;
             break;
         case TagId::Input:
@@ -253 +262 @@
     }
 
-    static bool relAttributeIsStyleSheet(const String& attributeValue)
-    {
-        LinkRelAttribute parsedAttribute { attributeValue };
+    static bool relAttributeIsStyleSheet(const LinkRelAttribute& parsedAttribute)
+    {
         return parsedAttribute.isStyleSheet && !parsedAttribute.isAlternate && !parsedAttribute.iconType && !parsedAttribute.isDNSPrefetch;
     }
@@ -276 +284 @@
     }
 
-    CachedResource::Type resourceType() const
+    std::optional<CachedResource::Type> resourceType() const
     {
         switch (m_tagId) {
@@ -287 +295 @@
             return CachedResource::ImageResource;
         case TagId::Link:
-            ASSERT(m_linkIsStyleSheet);
-            return CachedResource::CSSStyleSheet;
+            if (m_linkIsStyleSheet)
+                return CachedResource::CSSStyleSheet;
+            if (m_linkIsPreload)
+                return LinkLoader::resourceTypeFromAsAttribute(m_asAttribute);
+            break;
         case TagId::Meta:
         case TagId::Unknown:
@@ -309 +320 @@
             return false;
 
-        if (m_tagId == TagId::Link && !m_linkIsStyleSheet)
+        if (m_tagId == TagId::Link && !m_linkIsStyleSheet && !m_linkIsPreload)
             return false;
 
@@ -326 +337 @@
     String m_crossOriginMode;
     bool m_linkIsStyleSheet;
+    bool m_linkIsPreload;
     String m_mediaAttribute;
     String m_nonceAttribute;
     String m_metaContent;
+    String m_asAttribute;
     bool m_metaIsViewport;
     bool m_inputIsImage;

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

@@ -1223 +1223 @@
 
     CachedResourceHandle<CachedResource> resource = requestResource(type, WTFMove(request), ForPreload::Yes);
-    if (!resource || (m_preloads && m_preloads->contains(resource.get())))
-        return nullptr;
-    // Fonts need special treatment since just creating the resource doesn't trigger a load.
-    if (type == CachedResource::FontResource)
-        downcast<CachedFont>(resource.get())->beginLoadIfNeeded(*this);
-    resource->increasePreloadCount();
-
-    if (!m_preloads)
-        m_preloads = std::make_unique<ListHashSet<CachedResource*>>();
-    m_preloads->add(resource.get());
-
+    if (resource && (!m_preloads || !m_preloads->contains(resource.get()))) {
+        // Fonts need special treatment since just creating the resource doesn't trigger a load.
+        if (type == CachedResource::FontResource)
+            downcast<CachedFont>(resource.get())->beginLoadIfNeeded(*this);
+        resource->increasePreloadCount();
+
+        if (!m_preloads)
+            m_preloads = std::make_unique<ListHashSet<CachedResource*>>();
+        m_preloads->add(resource.get());
+    }
     return resource;
 }