| Index: Source/core/inspector/InspectorPageAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
|
| index 782374f65edae34dd571a6f959d777ec137e85f7..3f8b34e253043fa3cc7e89baec5afb1cc0aa5d87 100644
|
| --- a/Source/core/inspector/InspectorPageAgent.cpp
|
| +++ b/Source/core/inspector/InspectorPageAgent.cpp
|
| @@ -555,7 +555,7 @@ static PassRefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie> > buildArrayForC
|
| return cookies;
|
| }
|
|
|
| -static void cachedResourcesForDocument(Document* document, Vector<Resource*>& result)
|
| +static void cachedResourcesForDocument(Document* document, Vector<Resource*>& result, bool skipXHRs)
|
| {
|
| const ResourceFetcher::DocumentResourceMap& allResources = document->fetcher()->allResources();
|
| ResourceFetcher::DocumentResourceMap::const_iterator end = allResources.end();
|
| @@ -573,6 +573,10 @@ static void cachedResourcesForDocument(Document* document, Vector<Resource*>& re
|
| if (toFontResource(cachedResource)->stillNeedsLoad())
|
| continue;
|
| break;
|
| + case Resource::Raw:
|
| + if (skipXHRs)
|
| + continue;
|
| + break;
|
| default:
|
| // All other Resource types download immediately.
|
| break;
|
| @@ -598,15 +602,15 @@ Vector<Document*> InspectorPageAgent::importsForFrame(LocalFrame* frame)
|
| return result;
|
| }
|
|
|
| -static Vector<Resource*> cachedResourcesForFrame(LocalFrame* frame)
|
| +static Vector<Resource*> cachedResourcesForFrame(LocalFrame* frame, bool skipXHRs)
|
| {
|
| Vector<Resource*> result;
|
| Document* rootDocument = frame->document();
|
| Vector<Document*> loaders = InspectorPageAgent::importsForFrame(frame);
|
|
|
| - cachedResourcesForDocument(rootDocument, result);
|
| + cachedResourcesForDocument(rootDocument, result, skipXHRs);
|
| for (size_t i = 0; i < loaders.size(); ++i)
|
| - cachedResourcesForDocument(loaders[i], result);
|
| + cachedResourcesForDocument(loaders[i], result, skipXHRs);
|
|
|
| return result;
|
| }
|
| @@ -617,7 +621,7 @@ static Vector<KURL> allResourcesURLsForFrame(LocalFrame* frame)
|
|
|
| result.append(urlWithoutFragment(frame->loader().documentLoader()->url()));
|
|
|
| - Vector<Resource*> allResources = cachedResourcesForFrame(frame);
|
| + Vector<Resource*> allResources = cachedResourcesForFrame(frame, false);
|
| for (Vector<Resource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it)
|
| result.append(urlWithoutFragment((*it)->url()));
|
|
|
| @@ -1175,7 +1179,7 @@ PassRefPtr<TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObject
|
| .setFrame(frameObject)
|
| .setResources(subresources);
|
|
|
| - Vector<Resource*> allResources = cachedResourcesForFrame(frame);
|
| + Vector<Resource*> allResources = cachedResourcesForFrame(frame, true);
|
| for (Vector<Resource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
|
| Resource* cachedResource = *it;
|
|
|
|
|