Chromium Code Reviews| Index: Source/core/inspector/InspectorDebuggerAgent.h |
| diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h |
| index cc5b6767a0fcab7274c547f5ea7498c2ee34a41e..3d4b50cd0a4fc11b594fe51afacd80501188c980 100644 |
| --- a/Source/core/inspector/InspectorDebuggerAgent.h |
| +++ b/Source/core/inspector/InspectorDebuggerAgent.h |
| @@ -64,6 +64,11 @@ typedef String ErrorString; |
| class InspectorDebuggerAgent : public InspectorBaseAgent<InspectorDebuggerAgent>, public ScriptDebugListener, public InspectorBackendDispatcher::DebuggerCommandHandler { |
| WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent); WTF_MAKE_FAST_ALLOCATED; |
| public: |
| + enum BreakpointSource { |
| + Interactive, |
|
vsevik
2013/06/07 12:42:57
UserBreakpointSource
SeRya
2013/06/07 13:11:34
Done.
|
| + DebugCommand |
|
vsevik
2013/06/07 12:42:57
DebugCommandBreakpointSource
SeRya
2013/06/07 13:11:34
Done.
|
| + }; |
| + |
| static const char* backtraceObjectGroup; |
| virtual ~InspectorDebuggerAgent(); |
| @@ -135,6 +140,9 @@ public: |
| virtual void reportMemoryUsage(MemoryObjectInfo*) const; |
| + void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource); |
| + void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource); |
| + |
| protected: |
| InspectorDebuggerAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScriptManager*); |
| @@ -165,7 +173,7 @@ private: |
| void setPauseOnExceptionsImpl(ErrorString*, int); |
| - PassRefPtr<TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&); |
| + PassRefPtr<TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&, BreakpointSource); |
| void clear(); |
| bool assertPaused(ErrorString*); |
| void clearBreakDetails(); |
| @@ -174,7 +182,7 @@ private: |
| typedef HashMap<String, Script> ScriptsMap; |
| typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpointIdsMap; |
| - typedef HashMap<String, String> DebugServerBreakpointIdToBreakpointIdMap; |
| + typedef HashMap<String, std::pair<String, BreakpointSource> > DebugServerBreakpointToBreakpointIdAndSourceMap; |
| InjectedScriptManager* m_injectedScriptManager; |
| InspectorFrontend::Debugger* m_frontend; |
| @@ -182,7 +190,7 @@ private: |
| ScriptValue m_currentCallStack; |
| ScriptsMap m_scripts; |
| BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpointIds; |
| - DebugServerBreakpointIdToBreakpointIdMap m_serverBreakpointIdToBreakpointId; |
| + DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints; |
| String m_continueToLocationBreakpointId; |
| InspectorFrontend::Debugger::Reason::Enum m_breakReason; |
| RefPtr<InspectorObject> m_breakAuxData; |