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

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

Issue 305753005: DevTools: disable DOMDebuggerAgent when DOMAgent or DebuggerAgent were disabled. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: bugfix Created 6 years, 7 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/InspectorDOMDebuggerAgent.h ('k') | Source/core/inspector/InspectorDebuggerAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorDOMDebuggerAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
index 60701d59dc35a67dd6f55be30c3e767c621f2028..bedc03bd1118731b97098b3c9adefeb3f952cb9a 100644
--- a/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
+++ b/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
@@ -85,6 +85,7 @@ InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InspectorDOMAgent* domAgent
, m_pauseInNextEventListener(false)
{
m_debuggerAgent->setListener(this);
+ m_domAgent->setListener(this);
}
InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent()
@@ -96,7 +97,8 @@ InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent()
// Browser debugger agent enabled only when JS debugger is enabled.
void InspectorDOMDebuggerAgent::debuggerWasEnabled()
{
- m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
+ if (m_domAgent->enabled() && m_debuggerAgent->enabled())
+ m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
}
void InspectorDOMDebuggerAgent::debuggerWasDisabled()
@@ -104,6 +106,17 @@ void InspectorDOMDebuggerAgent::debuggerWasDisabled()
disable();
}
+void InspectorDOMDebuggerAgent::domAgentWasEnabled()
+{
+ if (m_domAgent->enabled() && m_debuggerAgent->enabled())
+ m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
+}
+
+void InspectorDOMDebuggerAgent::domAgentWasDisabled()
+{
+ disable();
+}
+
void InspectorDOMDebuggerAgent::stepInto()
{
m_pauseInNextEventListener = true;
« no previous file with comments | « Source/core/inspector/InspectorDOMDebuggerAgent.h ('k') | Source/core/inspector/InspectorDebuggerAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698