Changeset 248269 in webkit

Timestamp:

Aug 5, 2019 9:26:00 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 Alex Christensen.

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) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-05  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 Alex Christensen.
+
+        * 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-08-05  Takashi Komori  <Takashi.Komori@sony.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-05  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 Alex Christensen.
+
+        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-08-04  Konstantin Tokarev  <annulen@yandex.ru>
 

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

@@ -276 +276 @@
         return false;
 
-    if (cachePolicyAllowsExpired(request.cachePolicy()))
+    if (request.requester() == ResourceRequest::Requester::XHR || request.requester() == ResourceRequest::Requester::Fetch)
         return false;
 
-    return request.requester() != ResourceRequest::Requester::XHR && request.requester() != ResourceRequest::Requester::Fetch;
+    switch (request.cachePolicy()) {
+    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;
 }
 #endif