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

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

Issue 7708013: Merge 93042 - Web Inspector: [V8] crash upon stepIn while not on pause. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 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/WebCore/ChangeLog ('k') | Source/WebCore/inspector/InspectorDebuggerAgent.cpp » ('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) 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 PassRefPtr<InspectorArray> currentCallFrames(); 123 PassRefPtr<InspectorArray> currentCallFrames();
124 124
125 virtual void didParseSource(const String& sourceId, const Script&); 125 virtual void didParseSource(const String& sourceId, const Script&);
126 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage); 126 virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage);
127 virtual void didPause(ScriptState*, const ScriptValue& callFrames, const Scr iptValue& exception); 127 virtual void didPause(ScriptState*, const ScriptValue& callFrames, const Scr iptValue& exception);
128 virtual void didContinue(); 128 virtual void didContinue();
129 129
130 PassRefPtr<InspectorObject> resolveBreakpoint(const String& breakpointId, co nst String& sourceId, const ScriptBreakpoint&); 130 PassRefPtr<InspectorObject> resolveBreakpoint(const String& breakpointId, co nst String& sourceId, const ScriptBreakpoint&);
131 void clear(); 131 void clear();
132 bool assertPaused(ErrorString*);
132 133
133 typedef HashMap<String, Script> ScriptsMap; 134 typedef HashMap<String, Script> ScriptsMap;
134 typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpoint IdsMap; 135 typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpoint IdsMap;
135 136
136 InstrumentingAgents* m_instrumentingAgents; 137 InstrumentingAgents* m_instrumentingAgents;
137 InspectorState* m_inspectorState; 138 InspectorState* m_inspectorState;
138 InjectedScriptManager* m_injectedScriptManager; 139 InjectedScriptManager* m_injectedScriptManager;
139 InspectorFrontend::Debugger* m_frontend; 140 InspectorFrontend::Debugger* m_frontend;
140 ScriptState* m_pausedScriptState; 141 ScriptState* m_pausedScriptState;
141 ScriptValue m_currentCallStack; 142 ScriptValue m_currentCallStack;
142 ScriptsMap m_scripts; 143 ScriptsMap m_scripts;
143 BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpo intIds; 144 BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpo intIds;
144 String m_continueToLocationBreakpointId; 145 String m_continueToLocationBreakpointId;
145 RefPtr<InspectorObject> m_breakProgramDetails; 146 RefPtr<InspectorObject> m_breakProgramDetails;
146 bool m_javaScriptPauseScheduled; 147 bool m_javaScriptPauseScheduled;
147 Listener* m_listener; 148 Listener* m_listener;
148 }; 149 };
149 150
150 } // namespace WebCore 151 } // namespace WebCore
151 152
152 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) 153 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
153 154
154 #endif // !defined(InspectorDebuggerAgent_h) 155 #endif // !defined(InspectorDebuggerAgent_h)
OLDNEW
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/inspector/InspectorDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698