Title: [181766] trunk/Source/WebCore
- Revision
- 181766
- Author
- [email protected]
- Date
- 2015-03-19 16:26:08 -0700 (Thu, 19 Mar 2015)
Log Message
Get rid of "CachePolicyCache" cache policy
https://bugs.webkit.org/show_bug.cgi?id=142881
Reviewed by Antti Koivisto.
Get rid of "CachePolicyCache" cache policy as it is unused.
* loader/cache/CachePolicy.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::mustRevalidateDueToCacheHeaders):
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::mustRevalidateIsExpiredKey): Deleted.
* page/DiagnosticLoggingKeys.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181765 => 181766)
--- trunk/Source/WebCore/ChangeLog 2015-03-19 23:01:14 UTC (rev 181765)
+++ trunk/Source/WebCore/ChangeLog 2015-03-19 23:26:08 UTC (rev 181766)
@@ -1,3 +1,19 @@
+2015-03-19 Chris Dumez <[email protected]>
+
+ Get rid of "CachePolicyCache" cache policy
+ https://bugs.webkit.org/show_bug.cgi?id=142881
+
+ Reviewed by Antti Koivisto.
+
+ Get rid of "CachePolicyCache" cache policy as it is unused.
+
+ * loader/cache/CachePolicy.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::mustRevalidateDueToCacheHeaders):
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::mustRevalidateIsExpiredKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+
2015-03-19 Alex Christensen <[email protected]>
[Content Extensions] Test regular _expression_ parse failures.
Modified: trunk/Source/WebCore/loader/cache/CachePolicy.h (181765 => 181766)
--- trunk/Source/WebCore/loader/cache/CachePolicy.h 2015-03-19 23:01:14 UTC (rev 181765)
+++ trunk/Source/WebCore/loader/cache/CachePolicy.h 2015-03-19 23:26:08 UTC (rev 181766)
@@ -29,7 +29,6 @@
namespace WebCore {
enum CachePolicy {
- CachePolicyCache,
CachePolicyVerify,
CachePolicyRevalidate,
CachePolicyReload,
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (181765 => 181766)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-03-19 23:01:14 UTC (rev 181765)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-03-19 23:26:08 UTC (rev 181766)
@@ -688,7 +688,7 @@
bool CachedResource::mustRevalidateDueToCacheHeaders(const CachedResourceLoader& cachedResourceLoader, CachePolicy cachePolicy) const
{
- ASSERT(cachePolicy == CachePolicyRevalidate || cachePolicy == CachePolicyCache || cachePolicy == CachePolicyVerify);
+ ASSERT(cachePolicy == CachePolicyRevalidate || cachePolicy == CachePolicyVerify);
if (cachePolicy == CachePolicyRevalidate) {
logResourceRevalidationReason(cachedResourceLoader.frame(), DiagnosticLoggingKeys::reloadKey());
@@ -705,15 +705,6 @@
return true;
}
- if (cachePolicy == CachePolicyCache) {
- if (m_response.cacheControlContainsMustRevalidate() && isExpired()) {
- LOG(ResourceLoading, "CachedResource %p mustRevalidate because of cachePolicy == CachePolicyCache and m_response.cacheControlContainsMustRevalidate() && isExpired()\n", this);
- logResourceRevalidationReason(cachedResourceLoader.frame(), DiagnosticLoggingKeys::mustRevalidateIsExpiredKey());
- return true;
- }
- return false;
- }
-
// CachePolicyVerify
if (isExpired()) {
LOG(ResourceLoading, "CachedResource %p mustRevalidate because of isExpired()\n", this);
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (181765 => 181766)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-03-19 23:01:14 UTC (rev 181765)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-03-19 23:26:08 UTC (rev 181766)
@@ -43,11 +43,6 @@
return ASCIILiteral("missingValidatorFields");
}
-String DiagnosticLoggingKeys::mustRevalidateIsExpiredKey()
-{
- return ASCIILiteral("mustRevalidateIsExpired");
-}
-
String DiagnosticLoggingKeys::pluginLoadedKey()
{
return ASCIILiteral("pluginLoaded");
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (181765 => 181766)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-03-19 23:01:14 UTC (rev 181765)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-03-19 23:26:08 UTC (rev 181766)
@@ -65,7 +65,6 @@
static String mediaLoadedKey();
static String mediaLoadingFailedKey();
WEBCORE_EXPORT static String missingValidatorFieldsKey();
- static String mustRevalidateIsExpiredKey();
static String navigationKey();
WEBCORE_EXPORT static String networkCacheKey();
static String networkKey();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
