Changeset 84110 in webkit

Timestamp:

Apr 17, 2011 2:30:32 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-17 Gavin Peters <​gavinp@chromium.org>

Reviewed by Adam Barth.

Add support for link rel type "subresource"
​https://bugs.webkit.org/show_bug.cgi?id=57842

Link rel=prefetch is great for cache warming for resources on
subsequent pages, but it launches requests at too low a priority
to use for subresources of the current page.

During testing, I was dissapointed to see the results for the http
test below don't give the subresource priority ordering. This is
another instance of ​https://bugs.webkit.org/show_bug.cgi?id=49238
which I'll be working on next, and thus fix the test.

• fast/dom/HTMLLinkElement/subresource-expected.txt: Added.
• fast/dom/HTMLLinkElement/subresource.html: Added.
• http/tests/misc/link-rel-prefetch-and-subresource-expected.txt: Added.
• http/tests/misc/link-rel-prefetch-and-subresource.html: Added.
• platform/gtk/Skipped:
• platform/mac/Skipped:
• platform/qt/Skipped:
• platform/win/Skipped:

2011-04-17 Gavin Peters <​gavinp@chromium.org>

Reviewed by Adam Barth.

Add support for link rel type "subresource"
​https://bugs.webkit.org/show_bug.cgi?id=57842

Link rel=prefetch is great for cache warming for resources on
subsequent pages, but it launches requests at too low a priority
to use for subresources of the current page.

Particularly after ​https://bugs.webkit.org/show_bug.cgi?id=51940
is implemented, a rel type that launches requests at an higher
priority is going to be very useful. This rel type is in the
HTML5 spec at ​http://wiki.whatwg.org/wiki/RelExtensions . An
expected use case will be for servers to provide subresource hints
in link headers, which will allow servers to help make the web
faster.

This feature continues my implementation of the Link header, which
we've talked about in WebKit-dev in
​https://lists.webkit.org/pipermail/webkit-dev/2011-February/016034.html.

Tests: fast/dom/HTMLLinkElement/subresource.html

http/tests/misc/link-rel-prefetch-and-subresource.html

• html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::~HTMLLinkElement): (WebCore::HTMLLinkElement::tokenizeRelAttribute): (WebCore::HTMLLinkElement::process): (WebCore::HTMLLinkElement::onloadTimerFired): (WebCore::HTMLLinkElement::notifyFinished):
• html/HTMLLinkElement.h: (WebCore::HTMLLinkElement::RelAttribute::RelAttribute):
• loader/cache/CachedResource.cpp: (WebCore::defaultPriorityForResourceType):
• loader/cache/CachedResource.h: (WebCore::CachedResource::isLinkResource):
• loader/cache/CachedResourceLoader.cpp: (WebCore::createResource): (WebCore::CachedResourceLoader::requestLinkResource): (WebCore::CachedResourceLoader::canRequest): (WebCore::CachedResourceLoader::incrementRequestCount): (WebCore::CachedResourceLoader::decrementRequestCount):
• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedResourceRequest.cpp: (WebCore::cachedResourceTypeToTargetType): (WebCore::CachedResourceRequest::load):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLLinkElement/subresource-expected.txt (added)
• LayoutTests/fast/dom/HTMLLinkElement/subresource.html (added)
• LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource-expected.txt (added)
• LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html (added)
• LayoutTests/platform/gtk/Skipped (modified) (2 diffs)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLLinkElement.cpp (modified) (8 diffs)
• Source/WebCore/html/HTMLLinkElement.h (modified) (3 diffs)
• Source/WebCore/loader/cache/CachedResource.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResource.h (modified) (2 diffs)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (6 diffs)
• Source/WebCore/loader/cache/CachedResourceLoader.h (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceRequest.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-17  Gavin Peters  <gavinp@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add support for link rel type "subresource"
+        https://bugs.webkit.org/show_bug.cgi?id=57842
+
+        Link rel=prefetch is great for cache warming for resources on
+        subsequent pages, but it launches requests at too low a priority
+        to use for subresources of the current page.
+
+        During testing, I was dissapointed to see the results for the http
+        test below don't give the subresource priority ordering.  This is
+        another instance of https://bugs.webkit.org/show_bug.cgi?id=49238
+        which I'll be working on next, and thus fix the test.
+
+        * fast/dom/HTMLLinkElement/subresource-expected.txt: Added.
+        * fast/dom/HTMLLinkElement/subresource.html: Added.
+        * http/tests/misc/link-rel-prefetch-and-subresource-expected.txt: Added.
+        * http/tests/misc/link-rel-prefetch-and-subresource.html: Added.
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2011-04-16  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -513 +513 @@
 http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html
 http/tests/misc/acid3.html
+http/tests/misc/link-rel-prefetch-and-subresource.html
 http/tests/misc/policy-delegate-called-twice.html
 http/tests/misc/prefetch-purpose.html
@@ -925 +926 @@
 fast/dom/HTMLLinkElement/prefetch-onload.html
 fast/dom/HTMLLinkElement/prefetch-beforeload.html
+fast/dom/HTMLLinkElement/subresource.html
 
 # Tests failing because the context menu is grabbing mouse events.

trunk/LayoutTests/platform/mac/Skipped

@@ -187 +187 @@
 fast/dom/HTMLLinkElement/prefetch-onerror.html
 fast/dom/HTMLLinkElement/prefetch-onload.html
+fast/dom/HTMLLinkElement/subresource.html
+http/tests/misc/link-rel-prefetch-and-subresource.html
 http/tests/misc/prefetch-purpose.html
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2959 +2959 @@
 fast/dom/HTMLLinkElement/prefetch-onerror.html
 fast/dom/HTMLLinkElement/prefetch-onload.html
+fast/dom/HTMLLinkElement/subresource.html
+http/tests/misc/link-rel-prefetch-and-subresource.html
 http/tests/misc/prefetch-purpose.html
 

trunk/LayoutTests/platform/win/Skipped

@@ -996 +996 @@
 fast/dom/HTMLLinkElement/prefetch-onerror.html
 fast/dom/HTMLLinkElement/prefetch-onload.html
+fast/dom/HTMLLinkElement/subresource.html
+http/tests/misc/link-rel-prefetch-and-subresource.html
 http/tests/misc/prefetch-purpose.html
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-17  Gavin Peters  <gavinp@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add support for link rel type "subresource"
+        https://bugs.webkit.org/show_bug.cgi?id=57842
+
+        Link rel=prefetch is great for cache warming for resources on
+        subsequent pages, but it launches requests at too low a priority
+        to use for subresources of the current page.
+
+        Particularly after https://bugs.webkit.org/show_bug.cgi?id=51940
+        is implemented, a rel type that launches requests at an higher
+        priority is going to be very useful.  This rel type is in the
+        HTML5 spec at http://wiki.whatwg.org/wiki/RelExtensions .  An
+        expected use case will be for servers to provide subresource hints
+        in link headers, which will allow servers to help make the web
+        faster.
+
+        This feature continues my implementation of the Link header, which
+        we've talked about in WebKit-dev in
+        https://lists.webkit.org/pipermail/webkit-dev/2011-February/016034.html.
+
+        Tests: fast/dom/HTMLLinkElement/subresource.html
+               http/tests/misc/link-rel-prefetch-and-subresource.html
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::~HTMLLinkElement):
+        (WebCore::HTMLLinkElement::tokenizeRelAttribute):
+        (WebCore::HTMLLinkElement::process):
+        (WebCore::HTMLLinkElement::onloadTimerFired):
+        (WebCore::HTMLLinkElement::notifyFinished):
+        * html/HTMLLinkElement.h:
+        (WebCore::HTMLLinkElement::RelAttribute::RelAttribute):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::defaultPriorityForResourceType):
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::isLinkResource):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::createResource):
+        (WebCore::CachedResourceLoader::requestLinkResource):
+        (WebCore::CachedResourceLoader::canRequest):
+        (WebCore::CachedResourceLoader::incrementRequestCount):
+        (WebCore::CachedResourceLoader::decrementRequestCount):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedResourceRequest.cpp:
+        (WebCore::cachedResourceTypeToTargetType):
+        (WebCore::CachedResourceRequest::load):
+
 2011-04-17  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -27 +27 @@
 #include "Attribute.h"
 #include "CachedCSSStyleSheet.h"
+#include "CachedResource.h"
 #include "CachedResourceLoader.h"
 #include "CSSStyleSelector.h"
@@ -79 +80 @@
     
 #if ENABLE(LINK_PREFETCH)
-    if (m_cachedLinkPrefetch)
-        m_cachedLinkPrefetch->removeClient(this);
+    if (m_cachedLinkResource)
+        m_cachedLinkResource->removeClient(this);
 #endif
 }
@@ -164 +165 @@
 #if ENABLE(LINK_PREFETCH)
     relAttribute.m_isLinkPrefetch = false;
+    relAttribute.m_isLinkSubresource = false;
 #endif
     if (equalIgnoringCase(rel, "stylesheet"))
@@ -171 +173 @@
     else if (equalIgnoringCase(rel, "dns-prefetch"))
         relAttribute.m_isDNSPrefetch = true;
-#if ENABLE(LINK_PREFETCH)
-    else if (equalIgnoringCase(rel, "prefetch"))
-        relAttribute.m_isLinkPrefetch = true;
-#endif
     else if (equalIgnoringCase(rel, "alternate stylesheet") || equalIgnoringCase(rel, "stylesheet alternate")) {
         relAttribute.m_isStyleSheet = true;
@@ -192 +190 @@
             else if (equalIgnoringCase(*it, "icon"))
                 relAttribute.m_isIcon = true;
+#if ENABLE(LINK_PREFETCH)
+            else if (equalIgnoringCase(*it, "prefetch"))
+              relAttribute.m_isLinkPrefetch = true;
+            else if (equalIgnoringCase(*it, "subresource"))
+              relAttribute.m_isLinkSubresource = true;
+#endif
         }
     }
@@ -233 +237 @@
 
 #if ENABLE(LINK_PREFETCH)
-    if (m_relAttribute.m_isLinkPrefetch && m_url.isValid() && document()->frame()) {
+    if ((m_relAttribute.m_isLinkPrefetch || m_relAttribute.m_isLinkSubresource) && m_url.isValid() && document()->frame()) {
         if (!checkBeforeLoadEvent())
             return;
-        m_cachedLinkPrefetch = document()->cachedResourceLoader()->requestLinkPrefetch(m_url);
-        if (m_cachedLinkPrefetch)
-            m_cachedLinkPrefetch->addClient(this);
+        ResourceLoadPriority priority = ResourceLoadPriorityUnresolved;
+        if (m_relAttribute.m_isLinkSubresource)
+            priority = ResourceLoadPriorityLow;
+
+        m_cachedLinkResource = document()->cachedResourceLoader()->requestLinkResource(m_url, priority);
+        if (m_cachedLinkResource)
+            m_cachedLinkResource->addClient(this);
     }
 #endif
@@ -410 +418 @@
 {
     ASSERT_UNUSED(timer, timer == &m_onloadTimer);
-    if (m_cachedLinkPrefetch->errorOccurred())
+    if (m_cachedLinkResource->errorOccurred())
         dispatchEvent(Event::create(eventNames().errorEvent, false, false));
     else
         dispatchEvent(Event::create(eventNames().loadEvent, false, false));
 
-    m_cachedLinkPrefetch->removeClient(this);
-    m_cachedLinkPrefetch = 0;
+    m_cachedLinkResource->removeClient(this);
+    m_cachedLinkResource = 0;
 }
 
@@ -422 +430 @@
 {
     m_onloadTimer.startOneShot(0);
-    ASSERT(m_cachedLinkPrefetch.get() == resource);
+    ASSERT(m_cachedLinkResource.get() == resource);
 }
 #endif

trunk/Source/WebCore/html/HTMLLinkElement.h

@@ -45 +45 @@
 #if ENABLE(LINK_PREFETCH)
         bool m_isLinkPrefetch;
+        bool m_isLinkSubresource;
 #endif
 
@@ -54 +55 @@
 #if ENABLE(LINK_PREFETCH)
             , m_isLinkPrefetch(false)
+            , m_isLinkSubresource(false)
 #endif
             { 
@@ -127 +129 @@
     RefPtr<CSSStyleSheet> m_sheet;
 #if ENABLE(LINK_PREFETCH)
-    CachedResourceHandle<CachedResource> m_cachedLinkPrefetch;
+    CachedResourceHandle<CachedResource> m_cachedLinkResource;
     Timer<HTMLLinkElement> m_onloadTimer;
 #endif

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

@@ -63 +63 @@
             return ResourceLoadPriorityLow;
 #if ENABLE(LINK_PREFETCH)
-        case CachedResource::LinkPrefetch:
+        case CachedResource::LinkResource:
             return ResourceLoadPriorityVeryLow;
 #endif

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

@@ -66 +66 @@
 #endif
 #if ENABLE(LINK_PREFETCH)
-        , LinkPrefetch
+        , LinkResource
 #endif
     };
@@ -130 +130 @@
 
     virtual bool isImage() const { return false; }
-    bool isPrefetch() const
+    bool isLinkResource() const
     {
 #if ENABLE(LINK_PREFETCH)
-        return type() == LinkPrefetch;
+        return type() == LinkResource;
 #else
         return false;

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

@@ -72 +72 @@
 #endif
 #if ENABLE(LINK_PREFETCH)
-    case CachedResource::LinkPrefetch:
-        return new CachedResource(url.string(), CachedResource::LinkPrefetch);
+    case CachedResource::LinkResource:
+        return new CachedResource(url.string(), CachedResource::LinkResource);
 #endif
     }
@@ -189 +189 @@
 
 #if ENABLE(LINK_PREFETCH)
-CachedResource* CachedResourceLoader::requestLinkPrefetch(const String& url)
+CachedResource* CachedResourceLoader::requestLinkResource(const String& url, ResourceLoadPriority priority)
 {
     ASSERT(frame());
-    return requestResource(CachedResource::LinkPrefetch, url, String());
+    return requestResource(CachedResource::LinkResource, url, String(), priority);
 }
 #endif
@@ -207 +207 @@
     case CachedResource::FontResource:
 #if ENABLE(LINK_PREFETCH)
-    case CachedResource::LinkPrefetch:
+    case CachedResource::LinkResource:
 #endif
         // These types of resources can be loaded from any origin.
@@ -249 +249 @@
     }
 #if ENABLE(LINK_PREFETCH)
-    case CachedResource::LinkPrefetch:
+    case CachedResource::LinkResource:
         // Prefetch cannot affect the current document.
         break;
@@ -594 +594 @@
 void CachedResourceLoader::incrementRequestCount(const CachedResource* res)
 {
-    if (res->isPrefetch())
+    if (res->isLinkResource())
         return;
 
@@ -602 +602 @@
 void CachedResourceLoader::decrementRequestCount(const CachedResource* res)
 {
-    if (res->isPrefetch())
+    if (res->isLinkResource())
         return;
 

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

@@ -70 +70 @@
 #endif
 #if ENABLE(LINK_PREFETCH)
-    CachedResource* requestLinkPrefetch(const String &url);
+    CachedResource* requestLinkResource(const String &url, ResourceLoadPriority priority = ResourceLoadPriorityUnresolved);
 #endif
 

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

@@ -43 +43 @@
 namespace WebCore {
     
-static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type)
-{
+static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type, ResourceLoadPriority priority)
+{
+#if !ENABLE(LINK_PREFETCH)
+    UNUSED_PARAM(priority);
+#endif
     switch (type) {
     case CachedResource::CSSStyleSheet:
@@ -58 +61 @@
         return ResourceRequest::TargetIsImage;
 #if ENABLE(LINK_PREFETCH)
-    case CachedResource::LinkPrefetch:
-        return ResourceRequest::TargetIsPrefetch;
+    case CachedResource::LinkResource:
+        if (priority == ResourceLoadPriorityLowest)
+            return ResourceRequest::TargetIsPrefetch;
+        return ResourceRequest::TargetIsSubresource;
 #endif
     }
@@ -86 +91 @@
 
     ResourceRequest resourceRequest(resource->url());
-    resourceRequest.setTargetType(cachedResourceTypeToTargetType(resource->type()));
+    resourceRequest.setTargetType(cachedResourceTypeToTargetType(resource->type(), resource->loadPriority()));
 
     if (!resource->accept().isEmpty())
@@ -109 +114 @@
     
 #if ENABLE(LINK_PREFETCH)
-    if (resource->type() == CachedResource::LinkPrefetch)
+    if (resource->type() == CachedResource::LinkResource)
         resourceRequest.setHTTPHeaderField("Purpose", "prefetch");
 #endif