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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.h ('k') | Source/core/inspector/InspectorBaseAgent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 15 matching lines...) Expand all
26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/InjectedScriptHost.h" 32 #include "core/inspector/InjectedScriptHost.h"
33 33
34 #include "core/inspector/EventListenerInfo.h" 34 #include "core/inspector/EventListenerInfo.h"
35 #include "core/inspector/InspectorConsoleAgent.h" 35 #include "core/inspector/InspectorConsoleAgent.h"
36 #include "core/inspector/InspectorDebuggerAgent.h" 36 #include "core/inspector/V8DebuggerAgent.h"
37 #include "core/inspector/v8/V8Debugger.h" 37 #include "core/inspector/v8/V8Debugger.h"
38 #include "platform/JSONValues.h" 38 #include "platform/JSONValues.h"
39 39
40 #include "wtf/RefPtr.h" 40 #include "wtf/RefPtr.h"
41 #include "wtf/text/StringBuilder.h" 41 #include "wtf/text/StringBuilder.h"
42 42
43 namespace blink { 43 namespace blink {
44 44
45 PassRefPtrWillBeRawPtr<InjectedScriptHost> InjectedScriptHost::create() 45 PassRefPtrWillBeRawPtr<InjectedScriptHost> InjectedScriptHost::create()
46 { 46 {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 InjectedScriptHost::InspectableObject* InjectedScriptHost::inspectedObject(unsig ned num) 117 InjectedScriptHost::InspectableObject* InjectedScriptHost::inspectedObject(unsig ned num)
118 { 118 {
119 if (num >= m_inspectedObjects.size()) 119 if (num >= m_inspectedObjects.size())
120 return m_defaultInspectableObject.get(); 120 return m_defaultInspectableObject.get();
121 return m_inspectedObjects[num].get(); 121 return m_inspectedObjects[num].get();
122 } 122 }
123 123
124 void InjectedScriptHost::debugFunction(const String& scriptId, int lineNumber, i nt columnNumber) 124 void InjectedScriptHost::debugFunction(const String& scriptId, int lineNumber, i nt columnNumber)
125 { 125 {
126 if (m_debuggerAgent) 126 if (m_debuggerAgent)
127 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, Inspe ctorDebuggerAgent::DebugCommandBreakpointSource); 127 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, V8Deb uggerAgent::DebugCommandBreakpointSource);
128 } 128 }
129 129
130 void InjectedScriptHost::undebugFunction(const String& scriptId, int lineNumber, int columnNumber) 130 void InjectedScriptHost::undebugFunction(const String& scriptId, int lineNumber, int columnNumber)
131 { 131 {
132 if (m_debuggerAgent) 132 if (m_debuggerAgent)
133 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, In spectorDebuggerAgent::DebugCommandBreakpointSource); 133 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, V8 DebuggerAgent::DebugCommandBreakpointSource);
134 } 134 }
135 135
136 void InjectedScriptHost::monitorFunction(const String& scriptId, int lineNumber, int columnNumber, const String& functionName) 136 void InjectedScriptHost::monitorFunction(const String& scriptId, int lineNumber, int columnNumber, const String& functionName)
137 { 137 {
138 StringBuilder builder; 138 StringBuilder builder;
139 builder.appendLiteral("console.log(\"function "); 139 builder.appendLiteral("console.log(\"function ");
140 if (functionName.isEmpty()) 140 if (functionName.isEmpty())
141 builder.appendLiteral("(anonymous function)"); 141 builder.appendLiteral("(anonymous function)");
142 else 142 else
143 builder.append(functionName); 143 builder.append(functionName);
144 builder.appendLiteral(" called\" + (arguments.length > 0 ? \" with arguments : \" + Array.prototype.join.call(arguments, \", \") : \"\")) && false"); 144 builder.appendLiteral(" called\" + (arguments.length > 0 ? \" with arguments : \" + Array.prototype.join.call(arguments, \", \") : \"\")) && false");
145 if (m_debuggerAgent) 145 if (m_debuggerAgent)
146 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, Inspe ctorDebuggerAgent::MonitorCommandBreakpointSource, builder.toString()); 146 m_debuggerAgent->setBreakpoint(scriptId, lineNumber, columnNumber, V8Deb uggerAgent::MonitorCommandBreakpointSource, builder.toString());
147 } 147 }
148 148
149 void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumbe r, int columnNumber) 149 void InjectedScriptHost::unmonitorFunction(const String& scriptId, int lineNumbe r, int columnNumber)
150 { 150 {
151 if (m_debuggerAgent) 151 if (m_debuggerAgent)
152 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, In spectorDebuggerAgent::MonitorCommandBreakpointSource); 152 m_debuggerAgent->removeBreakpoint(scriptId, lineNumber, columnNumber, V8 DebuggerAgent::MonitorCommandBreakpointSource);
153 } 153 }
154 154
155 } // namespace blink 155 } // namespace blink
OLDNEW
« 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