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

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

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 11 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
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.h ('k') | Source/core/inspector/InspectorInstrumentation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorInspectorAgent.cpp
diff --git a/Source/core/inspector/InspectorInspectorAgent.cpp b/Source/core/inspector/InspectorInspectorAgent.cpp
index 8334dcec623c1acf8cd7fd91bcdb260429e89755..43f7ff54ce19b59ee7bb1626d47ad108a53586d0 100644
--- a/Source/core/inspector/InspectorInspectorAgent.cpp
+++ b/Source/core/inspector/InspectorInspectorAgent.cpp
@@ -52,13 +52,13 @@ namespace InspectorAgentState {
static const char inspectorAgentEnabled[] = "inspectorAgentEnabled";
}
-InspectorInspectorAgent::InspectorInspectorAgent(Page* page, InjectedScriptManager* injectedScriptManager)
+InspectorInspectorAgent::InspectorInspectorAgent(InspectorController* inspectorController, InjectedScriptManager* injectedScriptManager)
: InspectorBaseAgent<InspectorInspectorAgent>("Inspector")
- , m_inspectedPage(page)
+ , m_inspectorController(inspectorController)
, m_frontend(nullptr)
, m_injectedScriptManager(injectedScriptManager)
{
- ASSERT_ARG(page, page);
+ ASSERT_ARG(inspectorController, inspectorController);
}
InspectorInspectorAgent::~InspectorInspectorAgent()
@@ -70,7 +70,7 @@ InspectorInspectorAgent::~InspectorInspectorAgent()
void InspectorInspectorAgent::trace(Visitor* visitor)
{
- visitor->trace(m_inspectedPage);
+ visitor->trace(m_inspectorController);
visitor->trace(m_injectedScriptManager);
InspectorBaseAgent::trace(visitor);
}
@@ -131,12 +131,12 @@ void InspectorInspectorAgent::disable(ErrorString*)
void InspectorInspectorAgent::reset(ErrorString*)
{
- m_inspectedPage->inspectorController().reconnectFrontend();
+ m_inspectorController->reconnectFrontend();
}
void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
{
- if (frame->page()->mainFrame() != frame)
+ if (frame != frame->localFrameRoot())
return;
m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.h ('k') | Source/core/inspector/InspectorInstrumentation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698