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

Side by Side Diff: Source/core/inspector/InspectorDebuggerAgent.h

Issue 884753003: Fix template angle bracket syntax in inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Some more fixes Created 5 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010-2011 Google Inc. All rights reserved. 3 * Copyright (C) 2010-2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 String preprocessEventListener(LocalFrame*, const String& source, const Stri ng& url, const String& functionName); 95 String preprocessEventListener(LocalFrame*, const String& source, const Stri ng& url, const String& functionName);
96 ScriptSourceCode preprocess(LocalFrame*, const ScriptSourceCode&); 96 ScriptSourceCode preprocess(LocalFrame*, const ScriptSourceCode&);
97 97
98 // Part of the protocol. 98 // Part of the protocol.
99 void enable(ErrorString*) final; 99 void enable(ErrorString*) final;
100 void disable(ErrorString*) final; 100 void disable(ErrorString*) final;
101 void setBreakpointsActive(ErrorString*, bool active) final; 101 void setBreakpointsActive(ErrorString*, bool active) final;
102 void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) f inal; 102 void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) f inal;
103 103
104 void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optional URL, const String* optionalURLRegex, const int* optionalColumnNumber, const Stri ng* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder: :Array<TypeBuilder::Debugger::Location> >& locations) final; 104 void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optional URL, const String* optionalURLRegex, const int* optionalColumnNumber, const Stri ng* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder: :Array<TypeBuilder::Debugger::Location>>& locations) final;
105 void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const S tring* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuild er::Debugger::Location>& actualLocation) final; 105 void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const S tring* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuild er::Debugger::Location>& actualLocation) final;
106 void removeBreakpoint(ErrorString*, const String& breakpointId) final; 106 void removeBreakpoint(ErrorString*, const String& breakpointId) final;
107 void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, co nst bool* interstateLocationOpt) final; 107 void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, co nst bool* interstateLocationOpt) final;
108 void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<Type Builder::Array<TypeBuilder::Debugger::Location> >& positions) final; 108 void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<Type Builder::Array<TypeBuilder::Debugger::Location>>& positions) final;
109 void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debug ger::CallFrame> >&, RefPtr<TypeBuilder::Debugger::StackTrace>&) final; 109 void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debug ger::CallFrame>>&, RefPtr<TypeBuilder::Debugger::StackTrace>&) final;
110 void searchInContent(ErrorString*, const String& scriptId, const String& que ry, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeB uilder::Array<TypeBuilder::Page::SearchMatch> >&) final; 110 void searchInContent(ErrorString*, const String& scriptId, const String& que ry, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeB uilder::Array<TypeBuilder::Page::SearchMatch>>&) final;
111 void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSo urceError>&, const String& scriptId, const String& newContent, const bool* previ ew, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames , RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncSt ackTrace) final; 111 void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSo urceError>&, const String& scriptId, const String& newContent, const bool* previ ew, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncSta ckTrace) final;
112 void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilde r::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) final; 112 void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilde r::Array<TypeBuilder::Debugger::CallFrame>>& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) final;
113 void getScriptSource(ErrorString*, const String& scriptId, String* scriptSou rce) final; 113 void getScriptSource(ErrorString*, const String& scriptId, String* scriptSou rce) final;
114 void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeB uilder::Debugger::FunctionDetails>&) final; 114 void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeB uilder::Debugger::FunctionDetails>&) final;
115 void getGeneratorObjectDetails(ErrorString*, const String& objectId, RefPtr< TypeBuilder::Debugger::GeneratorObjectDetails>&) final; 115 void getGeneratorObjectDetails(ErrorString*, const String& objectId, RefPtr< TypeBuilder::Debugger::GeneratorObjectDetails>&) final;
116 void getCollectionEntries(ErrorString*, const String& objectId, RefPtr<TypeB uilder::Array<TypeBuilder::Debugger::CollectionEntry> >&) final; 116 void getCollectionEntries(ErrorString*, const String& objectId, RefPtr<TypeB uilder::Array<TypeBuilder::Debugger::CollectionEntry>>&) final;
117 void pause(ErrorString*) final; 117 void pause(ErrorString*) final;
118 void resume(ErrorString*) final; 118 void resume(ErrorString*) final;
119 void stepOver(ErrorString*) final; 119 void stepOver(ErrorString*) final;
120 void stepInto(ErrorString*) final; 120 void stepInto(ErrorString*) final;
121 void stepOut(ErrorString*) final; 121 void stepOut(ErrorString*) final;
122 void stepIntoAsync(ErrorString*) final; 122 void stepIntoAsync(ErrorString*) final;
123 void setPauseOnExceptions(ErrorString*, const String& pauseState) final; 123 void setPauseOnExceptions(ErrorString*, const String& pauseState) final;
124 void evaluateOnCallFrame(ErrorString*, 124 void evaluateOnCallFrame(ErrorString*,
125 const String& callFrameId, 125 const String& callFrameId,
126 const String& expression, 126 const String& expression,
127 const String* objectGroup, 127 const String* objectGroup,
128 const bool* includeCommandLineAPI, 128 const bool* includeCommandLineAPI,
129 const bool* doNotPauseOnExceptionsAndMuteConsole, 129 const bool* doNotPauseOnExceptionsAndMuteConsole,
130 const bool* returnByValue, 130 const bool* returnByValue,
131 const bool* generatePreview, 131 const bool* generatePreview,
132 RefPtr<TypeBuilder::Runtime::RemoteObject>& result, 132 RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
133 TypeBuilder::OptOutput<bool>* wasThrown, 133 TypeBuilder::OptOutput<bool>* wasThrown,
134 RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) final; 134 RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) final;
135 void compileScript(ErrorString*, const String& expression, const String& sou rceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debug ger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override; 135 void compileScript(ErrorString*, const String& expression, const String& sou rceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debug ger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override;
136 void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const i nt* executionContextId, const String* objectGroup, const bool* doNotPauseOnExcep tionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr< TypeBuilder::Debugger::ExceptionDetails>&) override; 136 void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const i nt* executionContextId, const String* objectGroup, const bool* doNotPauseOnExcep tionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr< TypeBuilder::Debugger::ExceptionDetails>&) override;
137 void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_var iableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, co nst String* in_functionObjectId) final; 137 void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_var iableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, co nst String* in_functionObjectId) final;
138 void skipStackFrames(ErrorString*, const String* pattern, const bool* skipCo ntentScripts) final; 138 void skipStackFrames(ErrorString*, const String* pattern, const bool* skipCo ntentScripts) final;
139 void setAsyncCallStackDepth(ErrorString*, int depth) final; 139 void setAsyncCallStackDepth(ErrorString*, int depth) final;
140 void enablePromiseTracker(ErrorString*, const bool* captureStacks) final; 140 void enablePromiseTracker(ErrorString*, const bool* captureStacks) final;
141 void disablePromiseTracker(ErrorString*) final; 141 void disablePromiseTracker(ErrorString*) final;
142 void getPromises(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugg er::PromiseDetails> >& promises) final; 142 void getPromises(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugg er::PromiseDetails>>& promises) final;
143 void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) final; 143 void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) final;
144 144
145 void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data); 145 void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
146 void didFireTimer(); 146 void didFireTimer();
147 void didHandleEvent(); 147 void didHandleEvent();
148 bool canBreakProgram(); 148 bool canBreakProgram();
149 void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, Pas sRefPtr<JSONObject> data); 149 void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, Pas sRefPtr<JSONObject> data);
150 void scriptExecutionBlockedByCSP(const String& directiveText); 150 void scriptExecutionBlockedByCSP(const String& directiveText);
151 void willCallFunction(ExecutionContext*, int scriptId, const String& scriptN ame, int scriptLine); 151 void willCallFunction(ExecutionContext*, int scriptId, const String& scriptN ame, int scriptLine);
152 void didCallFunction(); 152 void didCallFunction();
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 void pageDidCommitLoad(); 213 void pageDidCommitLoad();
214 214
215 private: 215 private:
216 SkipPauseRequest shouldSkipExceptionPause(); 216 SkipPauseRequest shouldSkipExceptionPause();
217 SkipPauseRequest shouldSkipStepPause(); 217 SkipPauseRequest shouldSkipStepPause();
218 218
219 void schedulePauseOnNextStatementIfSteppingInto(); 219 void schedulePauseOnNextStatementIfSteppingInto();
220 void cancelPauseOnNextStatement(); 220 void cancelPauseOnNextStatement();
221 void addMessageToConsole(MessageSource, MessageType); 221 void addMessageToConsole(MessageSource, MessageType);
222 222
223 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCal lFrames(); 223 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> currentCall Frames();
224 PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace(); 224 PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
225 225
226 void resetAsyncCallTracker(); 226 void resetAsyncCallTracker();
227 227
228 void changeJavaScriptRecursionLevel(int step); 228 void changeJavaScriptRecursionLevel(int step);
229 229
230 void didParseSource(const String& scriptId, const Script&, CompileResult) fi nal; 230 void didParseSource(const String& scriptId, const Script&, CompileResult) fi nal;
231 bool v8AsyncTaskEventsEnabled() const final; 231 bool v8AsyncTaskEventsEnabled() const final;
232 void didReceiveV8AsyncTaskEvent(ScriptState*, const String& eventType, const String& eventName, int id) final; 232 void didReceiveV8AsyncTaskEvent(ScriptState*, const String& eventType, const String& eventName, int id) final;
233 bool v8PromiseEventsEnabled() const final; 233 bool v8PromiseEventsEnabled() const final;
(...skipping 12 matching lines...) Expand all
246 246
247 bool isCallStackEmptyOrBlackboxed(); 247 bool isCallStackEmptyOrBlackboxed();
248 bool isTopCallFrameBlackboxed(); 248 bool isTopCallFrameBlackboxed();
249 bool isCallFrameWithUnknownScriptOrBlackboxed(PassRefPtrWillBeRawPtr<JavaScr iptCallFrame>); 249 bool isCallFrameWithUnknownScriptOrBlackboxed(PassRefPtrWillBeRawPtr<JavaScr iptCallFrame>);
250 PromiseTracker& promiseTracker() const { return *m_promiseTracker; } 250 PromiseTracker& promiseTracker() const { return *m_promiseTracker; }
251 251
252 void internalSetAsyncCallStackDepth(int); 252 void internalSetAsyncCallStackDepth(int);
253 void increaseCachedSkipStackGeneration(); 253 void increaseCachedSkipStackGeneration();
254 254
255 typedef HashMap<String, Script> ScriptsMap; 255 typedef HashMap<String, Script> ScriptsMap;
256 typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpoint IdsMap; 256 typedef HashMap<String, Vector<String>> BreakpointIdToDebugServerBreakpointI dsMap;
257 typedef HashMap<String, std::pair<String, BreakpointSource> > DebugServerBre akpointToBreakpointIdAndSourceMap; 257 typedef HashMap<String, std::pair<String, BreakpointSource>> DebugServerBrea kpointToBreakpointIdAndSourceMap;
258 258
259 enum DebuggerStep { 259 enum DebuggerStep {
260 NoStep = 0, 260 NoStep = 0,
261 StepInto, 261 StepInto,
262 StepOver, 262 StepOver,
263 StepOut 263 StepOut
264 }; 264 };
265 265
266 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager; 266 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
267 InspectorFrontend::Debugger* m_frontend; 267 InspectorFrontend::Debugger* m_frontend;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 RefPtrWillBeMember<AsyncCallChain> m_currentAsyncCallChain; 299 RefPtrWillBeMember<AsyncCallChain> m_currentAsyncCallChain;
300 unsigned m_nestedAsyncCallCount; 300 unsigned m_nestedAsyncCallCount;
301 bool m_performingAsyncStepIn; 301 bool m_performingAsyncStepIn;
302 WillBeHeapVector<RawPtrWillBeMember<AsyncCallTrackingListener>> m_asyncCallT rackingListeners; 302 WillBeHeapVector<RawPtrWillBeMember<AsyncCallTrackingListener>> m_asyncCallT rackingListeners;
303 }; 303 };
304 304
305 } // namespace blink 305 } // namespace blink
306 306
307 307
308 #endif // InspectorDebuggerAgent_h 308 #endif // InspectorDebuggerAgent_h
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorDOMStorageAgent.cpp ('k') | Source/core/inspector/InspectorDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698