Changeset 247362 in webkit

Timestamp:

Jul 11, 2019 2:04:05 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r247314.
​https://bugs.webkit.org/show_bug.cgi?id=199721

Caused performance regression. (Requested by deanj on
#webkit).

Reverted changeset:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r247314.
+        https://bugs.webkit.org/show_bug.cgi?id=199721
+
+        Caused performance regression. (Requested by deanj on
+        #webkit).
+
+        Reverted changeset:
+
+        "Disable speculative loading if cache is not to be used for
+        the load"
+        https://bugs.webkit.org/show_bug.cgi?id=199644
+        https://trac.webkit.org/changeset/247314
+
 2019-07-11  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r247314.
+        https://bugs.webkit.org/show_bug.cgi?id=199721
+
+        Caused performance regression. (Requested by deanj on
+        #webkit).
+
+        Reverted changeset:
+
+        "Disable speculative loading if cache is not to be used for
+        the load"
+        https://bugs.webkit.org/show_bug.cgi?id=199644
+        https://trac.webkit.org/changeset/247314
+
 2019-07-11  Dean Jackson  <dino@apple.com>
 

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)
 {
@@ -293 +276 @@
         return false;
 
-    if (cachePolicyValidForSpeculativeRevalidation(request.cachePolicy()))
+    if (cachePolicyAllowsExpired(request.cachePolicy()))
         return false;