Changeset 211049 in webkit

Timestamp:

Jan 23, 2017, 12:21:40 PM (9 years ago)

Author:

Antti Koivisto

Message:

Use priorities in speculative revalidation
​https://bugs.webkit.org/show_bug.cgi?id=167314

Reviewed by Chris Dumez.

We currently do all speculative cache operations with 'Medium' priority
and network operations with 'Low'. We should use the actual request priorities instead.

• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:

(WebKit::NetworkCache::constructRevalidationRequest):

Use priority when constructing validation request.

(WebKit::NetworkCache::SpeculativeLoadManager::retrieveEntryFromStorage):

Use priority when retrieving from cache.

(WebKit::NetworkCache::SpeculativeLoadManager::preloadEntry):

• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
• NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp:

(WebKit::NetworkCache::SubresourceInfo::encode):
(WebKit::NetworkCache::SubresourceInfo::decode):

Save and restore the priority.

• NetworkProcess/cache/NetworkCacheSubresourcesEntry.h:

(WebKit::NetworkCache::SubresourceInfo::SubresourceInfo):
(WebKit::NetworkCache::SubresourceInfo::priority):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (modified) (3 diffs)
• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp (modified) (2 diffs)
• NetworkProcess/cache/NetworkCacheSubresourcesEntry.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-23  Antti Koivisto  <antti@apple.com>
+
+        Use priorities in speculative revalidation
+        https://bugs.webkit.org/show_bug.cgi?id=167314
+
+        Reviewed by Chris Dumez.
+
+        We currently do all speculative cache operations with 'Medium' priority
+        and network operations with 'Low'. We should use the actual request priorities instead.
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+        (WebKit::NetworkCache::constructRevalidationRequest):
+
+            Use priority when constructing validation request.
+
+        (WebKit::NetworkCache::SpeculativeLoadManager::retrieveEntryFromStorage):
+
+            Use priority when retrieving from cache.
+
+        (WebKit::NetworkCache::SpeculativeLoadManager::preloadEntry):
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
+        * NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp:
+        (WebKit::NetworkCache::SubresourceInfo::encode):
+        (WebKit::NetworkCache::SubresourceInfo::decode):
+
+            Save and restore the priority.
+
+        * NetworkProcess/cache/NetworkCacheSubresourcesEntry.h:
+        (WebKit::NetworkCache::SubresourceInfo::SubresourceInfo):
+        (WebKit::NetworkCache::SubresourceInfo::priority):
+
 2017-01-23  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp

@@ -104 +104 @@
     if (!lastModified.isEmpty())
         revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
+    
+    revalidationRequest.setPriority(subResourceInfo.priority());
 
     return revalidationRequest;
@@ -405 +407 @@
 }
 
-void SpeculativeLoadManager::retrieveEntryFromStorage(const Key& key, RetrieveCompletionHandler&& completionHandler)
-{
-    m_storage.retrieve(key, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler = WTFMove(completionHandler)](auto record) {
+void SpeculativeLoadManager::retrieveEntryFromStorage(const Key& key, ResourceLoadPriority priority, RetrieveCompletionHandler&& completionHandler)
+{
+    m_storage.retrieve(key, static_cast<unsigned>(priority), [completionHandler = WTFMove(completionHandler)](auto record) {
         if (!record) {
             completionHandler(nullptr);
@@ -488 +490 @@
     if (m_pendingPreloads.contains(key))
         return;
-
+    
     m_pendingPreloads.add(key, nullptr);
-    retrieveEntryFromStorage(key, [this, key, subResourceInfo, frameID](std::unique_ptr<Entry> entry) {
+    retrieveEntryFromStorage(key, subResourceInfo.priority(), [this, key, subResourceInfo, frameID](std::unique_ptr<Entry> entry) {
         ASSERT(!m_pendingPreloads.get(key));
         bool removed = m_pendingPreloads.remove(key);

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h

@@ -62 +62 @@
     void addPreloadedEntry(std::unique_ptr<Entry>, const GlobalFrameID&, std::optional<WebCore::ResourceRequest>&& revalidationRequest = std::nullopt);
     void preloadEntry(const Key&, const SubresourceInfo&, const GlobalFrameID&);
-    void retrieveEntryFromStorage(const Key&, RetrieveCompletionHandler&&);
+    void retrieveEntryFromStorage(const Key&, WebCore::ResourceLoadPriority, RetrieveCompletionHandler&&);
     void revalidateEntry(std::unique_ptr<Entry>, const SubresourceInfo&, const GlobalFrameID&);
     bool satisfyPendingRequests(const Key&, Entry*);

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp

@@ -45 +45 @@
     encoder << m_firstPartyForCookies;
     encoder << m_requestHeaders;
+    encoder.encodeEnum(m_priority);
 }
 
@@ -61 +62 @@
         return false;
 
+    if (!decoder.decodeEnum(info.m_priority))
+        return false;
+    
     return true;
 }

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.h

@@ -48 +48 @@
         , m_firstPartyForCookies(isTransient ? WebCore::URL() : request.firstPartyForCookies())
         , m_requestHeaders(isTransient ? WebCore::HTTPHeaderMap() : request.httpHeaderFields())
+        , m_priority(request.priority())
     {
     }
@@ -54 +55 @@
     const WebCore::URL& firstPartyForCookies() const { ASSERT(!m_isTransient); return m_firstPartyForCookies; }
     const WebCore::HTTPHeaderMap& requestHeaders() const { ASSERT(!m_isTransient); return m_requestHeaders; }
+    WebCore::ResourceLoadPriority priority() const { ASSERT(!m_isTransient); return m_priority; }
 
 private:
@@ -59 +61 @@
     WebCore::URL m_firstPartyForCookies;
     WebCore::HTTPHeaderMap m_requestHeaders;
+    WebCore::ResourceLoadPriority m_priority;
 };