Changeset 247314 in webkit

Timestamp:

Jul 10, 2019 11:17:59 AM (5 years ago)

Author:

youenn@apple.com

Message:

Disable speculative loading if cache is not to be used for the load
​https://bugs.webkit.org/show_bug.cgi?id=199644

Reviewed by Chris Dumez.

Source/WebKit:

When the page is reloaded, loads are instructed to not use the cache.
It is therefore unneeded to do speculative revalidation.
Allow speculative revalidation if the cache policy is either the default HTTP policy or
if policy is to refresh all cache data.
Covered by added test.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::cachePolicyValidForSpeculativeRevalidation):
(WebKit::NetworkCache::canRequestUseSpeculativeRevalidation):

LayoutTests:

• http/wpt/fetch/disable-speculative-for-reload-expected.txt: Added.
• http/wpt/fetch/disable-speculative-for-reload.html: Added.
• http/wpt/fetch/resources/iframe-with-image.py: Added.

(main):

• http/wpt/fetch/resources/image-load-count.py: Added.

(main):

• http/wpt/fetch/resources/image-load.py: Added.

(main):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/fetch/disable-speculative-for-reload-expected.txt (added)
• LayoutTests/http/wpt/fetch/disable-speculative-for-reload.html (added)
• LayoutTests/http/wpt/fetch/resources/iframe-with-image.py (added)
• LayoutTests/http/wpt/fetch/resources/image-load-count.py (added)
• LayoutTests/http/wpt/fetch/resources/image-load.py (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-10  Youenn Fablet  <youenn@apple.com>
+
+        Disable speculative loading if cache is not to be used for the load
+        https://bugs.webkit.org/show_bug.cgi?id=199644
+
+        Reviewed by Chris Dumez.
+
+        * http/wpt/fetch/disable-speculative-for-reload-expected.txt: Added.
+        * http/wpt/fetch/disable-speculative-for-reload.html: Added.
+        * http/wpt/fetch/resources/iframe-with-image.py: Added.
+        (main):
+        * http/wpt/fetch/resources/image-load-count.py: Added.
+        (main):
+        * http/wpt/fetch/resources/image-load.py: Added.
+        (main):
+
 2019-07-10  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-10  Youenn Fablet  <youenn@apple.com>
+
+        Disable speculative loading if cache is not to be used for the load
+        https://bugs.webkit.org/show_bug.cgi?id=199644
+
+        Reviewed by Chris Dumez.
+
+        When the page is reloaded, loads are instructed to not use the cache.
+        It is therefore unneeded to do speculative revalidation.
+        Allow speculative revalidation if the cache policy is either the default HTTP policy or
+        if policy is to refresh all cache data.
+        Covered by added test.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::cachePolicyValidForSpeculativeRevalidation):
+        (WebKit::NetworkCache::canRequestUseSpeculativeRevalidation):
+
 2019-07-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp

@@ -271 +271 @@
 
 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+static bool cachePolicyValidForSpeculativeRevalidation(WebCore::ResourceRequestCachePolicy policy)
+{
+    switch (policy) {
+    case WebCore::ResourceRequestCachePolicy::ReturnCacheDataElseLoad:
+    case WebCore::ResourceRequestCachePolicy::ReturnCacheDataDontLoad:
+    case WebCore::ResourceRequestCachePolicy::ReloadIgnoringCacheData:
+        return false;
+    case WebCore::ResourceRequestCachePolicy::UseProtocolCachePolicy:
+    case WebCore::ResourceRequestCachePolicy::RefreshAnyCacheData:
+        return true;
+    case WebCore::ResourceRequestCachePolicy::DoNotUseAnyCache:
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+    return false;
+}
+
 static bool inline canRequestUseSpeculativeRevalidation(const ResourceRequest& request)
 {
@@ -276 +293 @@
         return false;
 
-    if (cachePolicyAllowsExpired(request.cachePolicy()))
+    if (cachePolicyValidForSpeculativeRevalidation(request.cachePolicy()))
         return false;