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

Unified Diff: Source/core/inspector/PageDebuggerAgent.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: 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
Index: Source/core/inspector/PageDebuggerAgent.cpp
diff --git a/Source/core/inspector/PageDebuggerAgent.cpp b/Source/core/inspector/PageDebuggerAgent.cpp
index 1e8269f92cc5f149a0c73f092f3a2143bb969a36..5adbaf0ad6f80af4f55acfcae6811b765a5ea73c 100644
--- a/Source/core/inspector/PageDebuggerAgent.cpp
+++ b/Source/core/inspector/PageDebuggerAgent.cpp
@@ -84,12 +84,12 @@ void PageDebuggerAgent::disable()
void PageDebuggerAgent::startListeningScriptDebugServer()
{
- scriptDebugServer().addListener(this, m_pageAgent->page());
+ scriptDebugServer().addListener(this, m_pageAgent->mainFrame());
}
void PageDebuggerAgent::stopListeningScriptDebugServer()
{
- scriptDebugServer().removeListener(this, m_pageAgent->page());
+ scriptDebugServer().removeListener(this, m_pageAgent->mainFrame());
}
PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer()
@@ -136,6 +136,7 @@ InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString
void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
{
+ // FIXME: what about nested objects?
if (frame != m_pageAgent->mainFrame())
return;
@@ -149,8 +150,7 @@ void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
void PageDebuggerAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
{
- Frame* mainFrame = frame->page()->deprecatedLocalMainFrame();
- if (loader->frame() == mainFrame)
+ if (loader->frame() == m_pageAgent->mainFrame())
pageDidCommitLoad();
}

Powered by Google App Engine
This is Rietveld 408576698