Unreviewed, rolling out r232275.

May have caused a ~1% PLT regression on iOS

Reverted changeset:

"Store 0-lifetime stylesheets / scripts into the disk cache
for faster history navigations"
https://bugs.webkit.org/show_bug.cgi?id=186060
https://trac.webkit.org/changeset/232275

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c53be33..e106272 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2018-06-02  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r232275.
+
+        May have caused a ~1% PLT regression on iOS
+
+        Reverted changeset:
+
+        "Store 0-lifetime stylesheets / scripts into the disk cache
+        for faster history navigations"
+        https://bugs.webkit.org/show_bug.cgi?id=186060
+        https://trac.webkit.org/changeset/232275
+

 2018-06-02  Jeremy Jones  <jeremyj@apple.com>
 
         Make WKWebView firstResponder after entering or exiting fullscreen.
 2018-06-02  Jeremy Jones  <jeremyj@apple.com>
 
         Make WKWebView firstResponder after entering or exiting fullscreen.

diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
index c547ea8..9cc4a1e 100644 (file)
--- a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
+++ b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
@@ -276,7 +276,7 @@ static StoreDecision makeStoreDecision(const WebCore::ResourceRequest& originalR
     }
 
     bool isMainResource = originalRequest.requester() == WebCore::ResourceRequest::Requester::Main;
     }
 
     bool isMainResource = originalRequest.requester() == WebCore::ResourceRequest::Requester::Main;

-    bool storeUnconditionallyForHistoryNavigation = isMainResource || originalRequest.priority() >= WebCore::ResourceLoadPriority::High;
+    bool storeUnconditionallyForHistoryNavigation = isMainResource || originalRequest.priority() == WebCore::ResourceLoadPriority::VeryHigh;

     if (!storeUnconditionallyForHistoryNavigation) {
         auto now = WallTime::now();
         bool hasNonZeroLifetime = !response.cacheControlContainsNoCache() && WebCore::computeFreshnessLifetimeForHTTPFamily(response, now) > 0_ms;
     if (!storeUnconditionallyForHistoryNavigation) {
         auto now = WallTime::now();
         bool hasNonZeroLifetime = !response.cacheControlContainsNoCache() && WebCore::computeFreshnessLifetimeForHTTPFamily(response, now) > 0_ms;