Changeset 141684 in webkit

Timestamp:

Feb 1, 2013 11:40:08 PM (11 years ago)

Author:

simonjam@chromium.org

Message:

Add didChangePriority() to ResourceHandle
​https://bugs.webkit.org/show_bug.cgi?id=107995

Reviewed by Darin Fisher.

Source/Platform:

• chromium/public/WebURLLoader.h:

(WebKit):
(WebURLLoader):
(WebKit::WebURLLoader::didChangePriority): Added.

Source/WebCore:

For PLT, it's important that preloads remain a lower priority than parser requested resources.
This can lead to a 5% improvement.

The plan is to use this plumbing to expose the desired behavior. This patch simply allows a
resource's priority to change and have it propagate to the network layer. An upcoming patch will
lower the priority of preloads and then increase the priority when the parser officially requests
it.

No new tests. No visible change, because priority doesn't change yet.

• loader/cache/CachedResource.cpp:

(WebCore):
(WebCore::CachedResource::setLoadPriority):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource): Allow loads to modify priority.

• loader/cache/CachedResourceRequest.h:

(WebCore::CachedResourceRequest::setPriority): Notify when priority changes.

• platform/network/ResourceHandle.cpp:

(WebCore::ResourceHandle::didChangePriority): Added.
(WebCore):

• platform/network/ResourceHandle.h:

(ResourceHandle):

• platform/network/chromium/ResourceHandle.cpp:

(WebCore::ResourceHandleInternal::didChangePriority):
(WebCore):
(WebCore::ResourceHandle::didChangePriority):

• platform/network/chromium/ResourceHandleInternal.h:

(ResourceHandleInternal):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebURLLoader.h (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/cache/CachedResource.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedResourceRequest.h (modified) (1 diff)
• WebCore/platform/network/ResourceHandle.cpp (modified) (1 diff)
• WebCore/platform/network/ResourceHandle.h (modified) (2 diffs)
• WebCore/platform/network/chromium/ResourceHandle.cpp (modified) (2 diffs)
• WebCore/platform/network/chromium/ResourceHandleInternal.h (modified) (2 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-02-01  James Simonsen  <simonjam@chromium.org>
+
+        Add didChangePriority() to ResourceHandle
+        https://bugs.webkit.org/show_bug.cgi?id=107995
+
+        Reviewed by Darin Fisher.
+
+        * chromium/public/WebURLLoader.h:
+        (WebKit):
+        (WebURLLoader):
+        (WebKit::WebURLLoader::didChangePriority): Added.
+
 2013-02-01  Kevin Ellis  <kevers@chromium.org>
 

trunk/Source/Platform/chromium/public/WebURLLoader.h

@@ -33 +33 @@
 
 #include "WebCommon.h"
+#include "WebURLRequest.h"
 
 namespace WebKit {
@@ -38 +39 @@
 class WebData;
 class WebURLLoaderClient;
-class WebURLRequest;
 class WebURLResponse;
 struct WebURLError;
@@ -65 +65 @@
     // Suspends/resumes an asynchronous load.
     virtual void setDefersLoading(bool) = 0;
+
+    // Notifies the loader that the priority of a WebURLRequest has changed from
+    // its previous value. For example, a preload request starts with low
+    // priority, but may increase when the resource is needed for rendering.
+    virtual void didChangePriority(WebURLRequest::Priority newPriority) { }
 };
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  James Simonsen  <simonjam@chromium.org>
+
+        Add didChangePriority() to ResourceHandle
+        https://bugs.webkit.org/show_bug.cgi?id=107995
+
+        Reviewed by Darin Fisher.
+
+        For PLT, it's important that preloads remain a lower priority than parser requested resources.
+        This can lead to a 5% improvement.
+
+        The plan is to use this plumbing to expose the desired behavior. This patch simply allows a
+        resource's priority to change and have it propagate to the network layer. An upcoming patch will
+        lower the priority of preloads and then increase the priority when the parser officially requests
+        it.
+
+        No new tests. No visible change, because priority doesn't change yet.
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore):
+        (WebCore::CachedResource::setLoadPriority):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource): Allow loads to modify priority.
+        * loader/cache/CachedResourceRequest.h:
+        (WebCore::CachedResourceRequest::setPriority): Notify when priority changes.
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::didChangePriority): Added.
+        (WebCore):
+        * platform/network/ResourceHandle.h:
+        (ResourceHandle):
+        * platform/network/chromium/ResourceHandle.cpp:
+        (WebCore::ResourceHandleInternal::didChangePriority):
+        (WebCore):
+        (WebCore::ResourceHandle::didChangePriority):
+        * platform/network/chromium/ResourceHandleInternal.h:
+        (ResourceHandleInternal):
+
 2013-02-01  Roger Fong  <roger_fong@apple.com>
 

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

@@ -864 +864 @@
     return sizeof(CachedResource) + m_response.memoryUsage() + kAverageClientsHashMapSize + m_resourceRequest.url().string().length() * 2;
 }
-    
-void CachedResource::setLoadPriority(ResourceLoadPriority loadPriority) 
-{ 
+
+void CachedResource::setLoadPriority(ResourceLoadPriority loadPriority)
+{
     if (loadPriority == ResourceLoadPriorityUnresolved)
+        loadPriority = defaultPriorityForResourceType(type());
+    if (loadPriority == m_loadPriority)
         return;
     m_loadPriority = loadPriority;
+    if (m_loader && m_loader->handle())
+        m_loader->handle()->didChangePriority(loadPriority);
 }
 

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

@@ -466 +466 @@
         return 0;
 
-    resource->setLoadPriority(request.priority());
+    if (!request.forPreload() || policy != Use)
+        resource->setLoadPriority(request.priority());
+
     if ((policy != Use || resource->stillNeedsLoad()) && CachedResourceRequest::NoDefer == request.defer()) {
         resource->load(this, request.options());

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

@@ -52 +52 @@
     const ResourceLoaderOptions& options() const { return m_options; }
     void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
+    void setPriority(ResourceLoadPriority priority) { m_priority = priority; }
     ResourceLoadPriority priority() const { return m_priority; }
     bool forPreload() const { return m_forPreload; }

trunk/Source/WebCore/platform/network/ResourceHandle.cpp

@@ -186 +186 @@
 }
 
+void ResourceHandle::didChangePriority(ResourceLoadPriority)
+{
+    // Optionally implemented by platform.
+}
+
 void ResourceHandle::cacheMetadata(const ResourceResponse&, const Vector<char>&)
 {

trunk/Source/WebCore/platform/network/ResourceHandle.h

@@ -30 +30 @@
 #include "HTTPHeaderMap.h"
 #include "ResourceHandleTypes.h"
+#include "ResourceLoadPriority.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
@@ -191 +192 @@
     void pauseLoad(bool);
 #endif
-      
+
+    void didChangePriority(ResourceLoadPriority);
+
     ResourceRequest& firstRequest();
     const String& lastHTTPMethod() const;

trunk/Source/WebCore/platform/network/chromium/ResourceHandle.cpp

@@ -89 +89 @@
 }
 
+void ResourceHandleInternal::didChangePriority(WebURLRequest::Priority newPriority)
+{
+    m_loader->didChangePriority(newPriority);
+}
+
 bool ResourceHandleInternal::allowStoredCredentials() const
 {
@@ -277 +282 @@
 }
 
+void ResourceHandle::didChangePriority(ResourceLoadPriority newPriority)
+{
+    d->didChangePriority(static_cast<WebURLRequest::Priority>(newPriority));
+}
+
 // static
 void ResourceHandle::cacheMetadata(const ResourceResponse& response, const Vector<char>& data)

trunk/Source/WebCore/platform/network/chromium/ResourceHandleInternal.h

@@ -36 +36 @@
 #include <public/WebURLLoader.h>
 #include <public/WebURLLoaderClient.h>
+#include <public/WebURLRequest.h>
 
 namespace WebCore {
@@ -52 +53 @@
     void setDefersLoading(bool);
     bool allowStoredCredentials() const;
+    void didChangePriority(WebKit::WebURLRequest::Priority);
 
     // WebURLLoaderClient methods: