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

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

Issue 342713002: DevTools: Debugger StepInto/Out/Over initiated from a framework should not black-box it. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added missing null check Created 6 years, 5 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) 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 virtual void enable(); 192 virtual void enable();
193 virtual void disable(); 193 virtual void disable();
194 virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& callFrame s, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL; 194 virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& callFrame s, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
195 virtual void didContinue() OVERRIDE FINAL; 195 virtual void didContinue() OVERRIDE FINAL;
196 void reset(); 196 void reset();
197 void pageDidCommitLoad(); 197 void pageDidCommitLoad();
198 198
199 private: 199 private:
200 SkipPauseRequest shouldSkipExceptionPause(); 200 SkipPauseRequest shouldSkipExceptionPause();
201 SkipPauseRequest shouldSkipStepPause(); 201 SkipPauseRequest shouldSkipStepPause();
202 bool isTopCallFrameInFramework();
202 203
203 void cancelPauseOnNextStatement(); 204 void cancelPauseOnNextStatement();
204 void addMessageToConsole(MessageSource, MessageType); 205 void addMessageToConsole(MessageSource, MessageType);
205 206
206 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCal lFrames(); 207 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCal lFrames();
207 PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace(); 208 PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
208 209
209 virtual void didParseSource(const String& scriptId, const Script&) OVERRIDE FINAL; 210 virtual void didParseSource(const String& scriptId, const Script&) OVERRIDE FINAL;
210 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) OVERRIDE FINAL; 211 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) OVERRIDE FINAL;
211 212
(...skipping 18 matching lines...) Expand all
230 RefPtr<ScriptState> m_pausedScriptState; 231 RefPtr<ScriptState> m_pausedScriptState;
231 ScriptValue m_currentCallStack; 232 ScriptValue m_currentCallStack;
232 ScriptsMap m_scripts; 233 ScriptsMap m_scripts;
233 BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpo intIds; 234 BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpo intIds;
234 DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints; 235 DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints;
235 String m_continueToLocationBreakpointId; 236 String m_continueToLocationBreakpointId;
236 InspectorFrontend::Debugger::Reason::Enum m_breakReason; 237 InspectorFrontend::Debugger::Reason::Enum m_breakReason;
237 RefPtr<JSONObject> m_breakAuxData; 238 RefPtr<JSONObject> m_breakAuxData;
238 bool m_javaScriptPauseScheduled; 239 bool m_javaScriptPauseScheduled;
239 bool m_debuggerStepScheduled; 240 bool m_debuggerStepScheduled;
241 bool m_steppingFromFramework;
240 bool m_pausingOnNativeEvent; 242 bool m_pausingOnNativeEvent;
241 Listener* m_listener; 243 Listener* m_listener;
242 244
243 int m_skippedStepInCount; 245 int m_skippedStepInCount;
244 int m_minFrameCountForSkip; 246 int m_minFrameCountForSkip;
245 bool m_skipAllPauses; 247 bool m_skipAllPauses;
246 OwnPtr<ScriptRegexp> m_cachedSkipStackRegExp; 248 OwnPtr<ScriptRegexp> m_cachedSkipStackRegExp;
247 AsyncCallStackTracker m_asyncCallStackTracker; 249 AsyncCallStackTracker m_asyncCallStackTracker;
248 }; 250 };
249 251
250 } // namespace WebCore 252 } // namespace WebCore
251 253
252 254
253 #endif // !defined(InspectorDebuggerAgent_h) 255 #endif // !defined(InspectorDebuggerAgent_h)
OLDNEW
« no previous file with comments | « LayoutTests/inspector/sources/debugger/resources/framework.js ('k') | Source/core/inspector/InspectorDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698