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

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

Issue 892693006: Revert of DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index e01af05173ff8f88fa4b2a990ee8d6dc115900ed..9430e9408813680afbcce9f139b2afc0e07da6e7 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -910,7 +910,7 @@
m_state->setBoolean(ResourceAgentState::cacheDisabled, cacheDisabled);
if (cacheDisabled)
memoryCache()->evictResources();
- for (Frame* frame = m_pageAgent->inspectedFrame(); frame; frame = frame->tree().traverseNext()) {
+ for (Frame* frame = m_pageAgent->mainFrame(); frame; frame = frame->tree().traverseNext()) {
if (frame->isLocalFrame())
toLocalFrame(frame)->document()->fetcher()->garbageCollectDocumentResources();
}
@@ -923,7 +923,7 @@
void InspectorResourceAgent::loadResourceForFrontend(ErrorString* errorString, const String& url, const RefPtr<JSONObject>* requestHeaders, PassRefPtrWillBeRawPtr<LoadResourceForFrontendCallback> prpCallback)
{
RefPtrWillBeRawPtr<LoadResourceForFrontendCallback> callback = prpCallback;
- Frame* frame = m_pageAgent->inspectedFrame();
+ Frame* frame = m_pageAgent->page()->mainFrame();
if (!frame || !frame->isLocalFrame()) {
*errorString = "No frame to use as a loader found";
return;
@@ -972,7 +972,7 @@
void InspectorResourceAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
{
- if (loader->frame() != m_pageAgent->inspectedFrame())
+ if (loader->frame() != frame->page()->mainFrame())
return;
if (m_state->getBoolean(ResourceAgentState::cacheDisabled))
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.cpp ('k') | Source/core/inspector/InspectorResourceContentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698