[DevTools] Properly handle cache-only requests when cache is disabled

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
index c17e69117ea17014ca9062fd36ce5a304cc3c926..8bcdd619486138e7241cfeb0dec326d5ef301c96 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
@@ -116,6 +116,22 @@ bool matches(const String& url, const String& pattern) {
   return true;
 }
 
+bool LoadsFromCacheOnly(const ResourceRequest& request) {

[dgozman, 2016/11/15 19:54:02]

Either static or anonymous namespace please.

[jkarlin, 2016/11/15 21:27:21]

It's in the anonymous namespace already.

+  switch (request.getCachePolicy()) {
+    case WebCachePolicy::UseProtocolCachePolicy:
+    case WebCachePolicy::ValidatingCacheData:
+    case WebCachePolicy::BypassingCache:
+    case WebCachePolicy::ReturnCacheDataElseLoad:
+      return false;
+    case WebCachePolicy::ReturnCacheDataDontLoad:
+    case WebCachePolicy::ReturnCacheDataIfValid:
+    case WebCachePolicy::BypassCacheLoadOnlyFromCache:
+      return true;
+  }
+  NOTREACHED();
+  return false;
+}
+
 static std::unique_ptr<protocol::Network::Headers> buildObjectForHeaders(
     const HTTPHeaderMap& headers) {
   std::unique_ptr<protocol::DictionaryValue> headersObject =
@@ -509,13 +525,6 @@ DEFINE_TRACE(InspectorNetworkAgent) {
 }
 
 bool InspectorNetworkAgent::shouldBlockRequest(const ResourceRequest& request) {
-  if (m_state->booleanProperty(NetworkAgentState::cacheDisabled, false) &&
-      request.requestContext() != WebURLRequest::RequestContextInternal &&
-      (request.getCachePolicy() == WebCachePolicy::ReturnCacheDataDontLoad ||
-       request.getCachePolicy() == WebCachePolicy::ReturnCacheDataIfValid)) {
-    return true;
-  }
-
   protocol::DictionaryValue* blockedURLs =
       m_state->getObject(NetworkAgentState::blockedURLs);
   if (!blockedURLs)
@@ -635,12 +644,12 @@ void InspectorNetworkAgent::willSendRequest(
   request.setReportRawHeaders(true);
 
   if (m_state->booleanProperty(NetworkAgentState::cacheDisabled, false)) {
-    // It shouldn't be a ReturnCacheDataDontLoad request as those are blocked
-    // in shouldBlockRequest unless it's from an internal source.
-    DCHECK(WebCachePolicy::ReturnCacheDataDontLoad !=
-               request.getCachePolicy() ||
-           request.requestContext() == WebURLRequest::RequestContextInternal);
-    request.setCachePolicy(WebCachePolicy::BypassingCache);
+    if (LoadsFromCacheOnly(request) &&
+        request.requestContext() != WebURLRequest::RequestContextInternal) {
+      request.setCachePolicy(WebCachePolicy::BypassCacheLoadOnlyFromCache);
+    } else {
+      request.setCachePolicy(WebCachePolicy::BypassingCache);
+    }
     request.setShouldResetAppCache(true);
   }
   if (m_state->booleanProperty(NetworkAgentState::bypassServiceWorker, false))