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

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

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed dgozman's comments Created 5 years, 4 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/InjectedScriptHost.h ('k') | Source/core/inspector/InspectorBaseAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptHost.cpp
diff --git a/Source/core/inspector/InjectedScriptHost.cpp b/Source/core/inspector/InjectedScriptHost.cpp
index ee405a3de5853d104653574d1fa829b8b1738fb2..662900d8e929df27d5a746be0b65e99b73748ecf 100644
--- a/Source/core/inspector/InjectedScriptHost.cpp
+++ b/Source/core/inspector/InjectedScriptHost.cpp
@@ -33,7 +33,7 @@
#include "core/inspector/EventListenerInfo.h"
#include "core/inspector/InspectorConsoleAgent.h"
-#include "core/inspector/InspectorDebuggerAgent.h"
+#include "core/inspector/V8DebuggerAgent.h"
#include "core/inspector/v8/V8Debugger.h"
#include "platform/JSONValues.h"
@@ -124,13 +124,13 @@ InjectedScriptHost::InspectableObject* InjectedScriptHost::inspectedObject(unsig
void InjectedScriptHost::debugFunction(const String& scriptId, int lineNumber, int columnNumber)
{
if (m_debuggerAgent)
- m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, InspectorDebuggerAgent::DebugCommandBreakpointSource);
+ m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::DebugCommandBreakpointSource);
}
void InjectedScriptHost::undebugFunction(const String& scriptId, int lineNumber, int columnNumber)
{
if (m_debuggerAgent)
- m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, InspectorDebuggerAgent::DebugCommandBreakpointSource);
+ m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::DebugCommandBreakpointSource);
}
void InjectedScriptHost::monitorFunction(const String& scriptId, int lineNumber, int columnNumber, const String& functionName)
@@ -143,13 +143,13 @@ void InjectedScriptHost::monitorFunction(const String& scriptId, int lineNumber,
builder.append(functionName);
builder.appendLiteral(" called\" + (arguments.length > 0 ? \" with arguments: \" + Array.prototype.join.call(arguments, \", \") : \"\")) && false");
if (m_debuggerAgent)
- m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, InspectorDebuggerAgent::MonitorCommandBreakpointSource, builder.toString());
+ m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::MonitorCommandBreakpointSource, builder.toString());
}
void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumber, int columnNumber)
{
if (m_debuggerAgent)
- m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, InspectorDebuggerAgent::MonitorCommandBreakpointSource);
+ m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, V8DebuggerAgent::MonitorCommandBreakpointSource);
}
} // namespace blink
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.h ('k') | Source/core/inspector/InspectorBaseAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698