[WeakMemoryCache] Do not lookup MemoryCache when adding resource to Inspector

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

Index: third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
index b4cff806ccc3696881b138852ef13dbdf4e44c33..61a17b31a9f66b50f357009d87b5fd1118e52c06 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
@@ -545,17 +545,11 @@ void InspectorResourceAgent::markResourceAsCached(unsigned long identifier)
     frontend()->requestServedFromCache(IdentifiersFactory::requestId(identifier));
 }
 
-void InspectorResourceAgent::didReceiveResourceResponse(LocalFrame* frame, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, ResourceLoader* resourceLoader)
+void InspectorResourceAgent::didReceiveResourceResponse(LocalFrame* frame, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, Resource* cachedResource)
 {
     String requestId = IdentifiersFactory::requestId(identifier);
     bool isNotModified = response.httpStatusCode() == 304;
 
-    Resource* cachedResource = 0;
-    if (resourceLoader && !isNotModified)

[hiroshige, 2016/05/12 08:50:59]

I'm not so sure whether we can remove the |!isNotModified| check here, but at
least this CL passes the tests that were added together with the
|!isNotModified| check [1].
[1]
https://chromium.googlesource.com/chromium/src/+/d70c5978acbe10aae744abd437bc...

[Nate Chapin, 2016/05/12 19:36:53]

That's probably legacy. We now revalidate with the same Resource as the original
request, rather than creating a proxy Resource. I think this was to ensure that
we used the real revalidated Resource instead of the proxy Resource.

[dgozman, 2016/05/12 19:58:09]

Looks fine.

-        cachedResource = resourceLoader->cachedResource();

[Nate Chapin, 2016/05/12 21:18:19]

By the way, this is one of only two uses of ResourceLoader::cachedResource(),
and the other use (ResourceFetcher::willStartLoadingResource) looks to be
trivial to remove. Can we delete that in this patch, too?

[hiroshige, 2016/05/13 08:40:10]

Created a separate CL:
https://codereview.chromium.org/1977743002/.

-    if (!cachedResource)
-        cachedResource = InspectorPageAgent::cachedResource(frame, response.url());
-
     bool resourceIsEmpty = true;
     OwnPtr<protocol::Network::Response> resourceResponse = buildObjectForResourceResponse(response, cachedResource, &resourceIsEmpty);
 
@@ -615,10 +609,10 @@ void InspectorResourceAgent::didFinishLoading(unsigned long identifier, double m
     frontend()->loadingFinished(requestId, monotonicFinishTime, encodedDataLength);
 }
 
-void InspectorResourceAgent::didReceiveCORSRedirectResponse(LocalFrame* frame, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, ResourceLoader* resourceLoader)
+void InspectorResourceAgent::didReceiveCORSRedirectResponse(LocalFrame* frame, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, Resource* resource)
 {
     // Update the response and finish loading
-    didReceiveResourceResponse(frame, identifier, loader, response, resourceLoader);
+    didReceiveResourceResponse(frame, identifier, loader, response, resource);
     didFinishLoading(identifier, 0, WebURLLoaderClient::kUnknownEncodedDataLength);
 }