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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return adoptPtr(new InspectorDOMDebuggerAgent(domAgent, debuggerAgent)); 78 return adoptPtr(new InspectorDOMDebuggerAgent(domAgent, debuggerAgent));
79 } 79 }
80 80
81 InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InspectorDOMAgent* domAgent , InspectorDebuggerAgent* debuggerAgent) 81 InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InspectorDOMAgent* domAgent , InspectorDebuggerAgent* debuggerAgent)
82 : InspectorBaseAgent<InspectorDOMDebuggerAgent>("DOMDebugger") 82 : InspectorBaseAgent<InspectorDOMDebuggerAgent>("DOMDebugger")
83 , m_domAgent(domAgent) 83 , m_domAgent(domAgent)
84 , m_debuggerAgent(debuggerAgent) 84 , m_debuggerAgent(debuggerAgent)
85 , m_pauseInNextEventListener(false) 85 , m_pauseInNextEventListener(false)
86 { 86 {
87 m_debuggerAgent->setListener(this); 87 m_debuggerAgent->setListener(this);
88 m_domAgent->setListener(this);
88 } 89 }
89 90
90 InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent() 91 InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent()
91 { 92 {
92 ASSERT(!m_debuggerAgent); 93 ASSERT(!m_debuggerAgent);
93 ASSERT(!m_instrumentingAgents->inspectorDOMDebuggerAgent()); 94 ASSERT(!m_instrumentingAgents->inspectorDOMDebuggerAgent());
94 } 95 }
95 96
96 // Browser debugger agent enabled only when JS debugger is enabled. 97 // Browser debugger agent enabled only when JS debugger is enabled.
97 void InspectorDOMDebuggerAgent::debuggerWasEnabled() 98 void InspectorDOMDebuggerAgent::debuggerWasEnabled()
98 { 99 {
99 m_instrumentingAgents->setInspectorDOMDebuggerAgent(this); 100 if (m_domAgent->enabled() && m_debuggerAgent->enabled())
101 m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
100 } 102 }
101 103
102 void InspectorDOMDebuggerAgent::debuggerWasDisabled() 104 void InspectorDOMDebuggerAgent::debuggerWasDisabled()
103 { 105 {
104 disable(); 106 disable();
105 } 107 }
106 108
109 void InspectorDOMDebuggerAgent::domAgentWasEnabled()
110 {
111 if (m_domAgent->enabled() && m_debuggerAgent->enabled())
112 m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
113 }
114
115 void InspectorDOMDebuggerAgent::domAgentWasDisabled()
116 {
117 disable();
118 }
119
107 void InspectorDOMDebuggerAgent::stepInto() 120 void InspectorDOMDebuggerAgent::stepInto()
108 { 121 {
109 m_pauseInNextEventListener = true; 122 m_pauseInNextEventListener = true;
110 } 123 }
111 124
112 void InspectorDOMDebuggerAgent::didPause() 125 void InspectorDOMDebuggerAgent::didPause()
113 { 126 {
114 m_pauseInNextEventListener = false; 127 m_pauseInNextEventListener = false;
115 } 128 }
116 129
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 } 525 }
513 526
514 void InspectorDOMDebuggerAgent::clear() 527 void InspectorDOMDebuggerAgent::clear()
515 { 528 {
516 m_domBreakpoints.clear(); 529 m_domBreakpoints.clear();
517 m_pauseInNextEventListener = false; 530 m_pauseInNextEventListener = false;
518 } 531 }
519 532
520 } // namespace WebCore 533 } // namespace WebCore
521 534
OLDNEW
« 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