Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 337783003: DevTools: Preload HTML documents content before fetching resource content. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorPageAgent.cpp
diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
index 53489afabcde2a3431f1ff956c37a986c655d883..a751e74835f2a4856e618fc7ad3035798b0dd5cf 100644
--- a/Source/core/inspector/InspectorPageAgent.cpp
+++ b/Source/core/inspector/InspectorPageAgent.cpp
@@ -580,7 +580,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();
@@ -598,6 +598,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;
@@ -623,15 +627,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;
}
@@ -642,7 +646,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()));
@@ -1241,7 +1245,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;

Powered by Google App Engine
This is Rietveld 408576698