Changeset 181728 in webkit

Timestamp:

Mar 18, 2015 10:21:40 PM (9 years ago)

Author:

Antti Koivisto

Message:

Test disk cache behavior when using back navigation cache policy
​https://bugs.webkit.org/show_bug.cgi?id=142848

Reviewed by Chris Dumez.

Source/WebCore:

Add a way to override the normal cache policy so we can test reload behavior of cache without actually reloading.

Test: http/tests/cache/disk-cache-validation-back-navigation-policy.html

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::addExtraFieldsToRequest):

• loader/FrameLoader.h:

(WebCore::FrameLoader::setOverrideCachePolicyForTesting):

• testing/Internals.cpp:

(WebCore::Internals::setOverrideCachePolicy):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• http/tests/cache/disk-cache-validation-back-navigation-policy-expected.txt: Added.
• http/tests/cache/disk-cache-validation-back-navigation-policy.html: Added.

Test permutations of cache headers on reload including Cache-control: must-revalidate.

• platform/mac-wk1/TestExpectations:
• platform/win/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/disk-cache-validation-back-navigation-policy-expected.txt (added)
• LayoutTests/http/tests/cache/disk-cache-validation-back-navigation-policy.html (added)
• LayoutTests/http/tests/cache/disk-cache-validation.html (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.h (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-18  Antti Koivisto  <antti@apple.com>
+
+        Test disk cache behavior when using back navigation cache policy
+        https://bugs.webkit.org/show_bug.cgi?id=142848
+
+        Reviewed by Chris Dumez.
+
+        * http/tests/cache/disk-cache-validation-back-navigation-policy-expected.txt: Added.
+        * http/tests/cache/disk-cache-validation-back-navigation-policy.html: Added.
+
+            Test permutations of cache headers on reload including Cache-control: must-revalidate.
+
+        * platform/mac-wk1/TestExpectations:
+        * platform/win/TestExpectations:
+
 2015-03-18  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/http/tests/cache/disk-cache-validation.html

@@ -40 +40 @@
 debug("");
 
-runTests(generateTests(testMatrix));
+runTests(tests);
 
 </script>

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -94 +94 @@
 # Disk cache is WK2 only
 http/tests/cache/disk-cache-validation.html
+http/tests/cache/disk-cache-validation-back-navigation-policy.html
 http/tests/cache/disk-cache-disable.html
 http/tests/cache/disk-cache-vary-cookie.html

trunk/LayoutTests/platform/win/TestExpectations

@@ -2231 +2231 @@
 # Disk cache is WK2 only
 http/tests/cache/disk-cache-validation.html
+http/tests/cache/disk-cache-validation-back-navigation-policy.html
 http/tests/cache/disk-cache-disable.html
 http/tests/cache/disk-cache-vary-cookie.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-18  Antti Koivisto  <antti@apple.com>
+
+        Test disk cache behavior when using back navigation cache policy
+        https://bugs.webkit.org/show_bug.cgi?id=142848
+
+        Reviewed by Chris Dumez.
+
+        Add a way to override the normal cache policy so we can test reload behavior of cache without actually reloading.
+
+        Test: http/tests/cache/disk-cache-validation-back-navigation-policy.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::addExtraFieldsToRequest):
+        * loader/FrameLoader.h:
+        (WebCore::FrameLoader::setOverrideCachePolicyForTesting):
+        * testing/Internals.cpp:
+        (WebCore::Internals::setOverrideCachePolicy):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2015-03-18  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2559 +2559 @@
         request.setCachePolicy(ReloadIgnoringCacheData);
 
+    if (m_overrideCachePolicyForTesting)
+        request.setCachePolicy(m_overrideCachePolicyForTesting.value());
+
     if (request.cachePolicy() == ReloadIgnoringCacheData) {
         if (loadType == FrameLoadType::Reload)

trunk/Source/WebCore/loader/FrameLoader.h

@@ -42 +42 @@
 #include "ResourceHandleTypes.h"
 #include "ResourceLoadNotifier.h"
+#include "ResourceRequestBase.h"
 #include "SecurityContext.h"
 #include "Timer.h"
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
+#include <wtf/Optional.h>
 
 namespace WebCore {
@@ -288 +290 @@
     void forcePageTransitionIfNeeded();
 
+    void setOverrideCachePolicyForTesting(ResourceRequestCachePolicy policy) { m_overrideCachePolicyForTesting = policy; }
+    void clearOverrideCachePolicyForTesting() { m_overrideCachePolicyForTesting = Nullopt; }
+
 private:
     enum FormSubmissionCacheLoadPolicy {
@@ -436 +441 @@
 
     RefPtr<FrameNetworkingContext> m_networkingContext;
+
+    Optional<ResourceRequestCachePolicy> m_overrideCachePolicyForTesting;
 
     URL m_previousURL;

trunk/Source/WebCore/testing/Internals.cpp

@@ -309 +309 @@
     if (page->mainFrame().editor().isOverwriteModeEnabled())
         page->mainFrame().editor().toggleOverwriteModeEnabled();
+    page->mainFrame().loader().clearOverrideCachePolicyForTesting();
     ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
 #if ENABLE(VIDEO)
@@ -424 +425 @@
     ASSERT_NOT_REACHED();
     return "Error";
+}
+
+static ResourceRequestCachePolicy stringToResourceRequestCachePolicy(const String& policy)
+{
+    if (policy == "UseProtocolCachePolicy")
+        return UseProtocolCachePolicy;
+    if (policy == "ReloadIgnoringCacheData")
+        return ReloadIgnoringCacheData;
+    if (policy == "ReturnCacheDataElseLoad")
+        return ReturnCacheDataElseLoad;
+    if (policy == "ReturnCacheDataDontLoad")
+        return ReturnCacheDataDontLoad;
+    ASSERT_NOT_REACHED();
+    return UseProtocolCachePolicy;
+}
+
+void Internals::setOverrideCachePolicy(const String& policy)
+{
+    frame()->loader().setOverrideCachePolicyForTesting(stringToResourceRequestCachePolicy(policy));
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -90 +90 @@
     bool isLoadingFromMemoryCache(const String& url);
     String xhrResponseSource(XMLHttpRequest*);
+    void setOverrideCachePolicy(const String&);
 
     void clearMemoryCache();

trunk/Source/WebCore/testing/Internals.idl

@@ -30 +30 @@
 };
 
+// These map to ResourceRequestCachePolicy.
+enum CachePolicy {
+    "UseProtocolCachePolicy",
+    "ReloadIgnoringCacheData",
+    "ReturnCacheDataElseLoad",
+    "ReturnCacheDataDontLoad"
+};
+
+
 [
     NoInterfaceObject,
@@ -47 +56 @@
     void pruneMemoryCacheToSize(long size);
     long memoryCacheSize();
+    void setOverrideCachePolicy(CachePolicy policy);
 
     void clearPageCache();