Support merged Dart-JS callstacks

Source/core/inspector/InspectorDebuggerAgent.h

Index: Source/core/inspector/InspectorDebuggerAgent.h
diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h
index 07a019d23d1492a00a744ac6d9a482b3211ed9a9..35460f84ec6dafd64d41f715c18ead25b55692c5 100644
--- a/Source/core/inspector/InspectorDebuggerAgent.h
+++ b/Source/core/inspector/InspectorDebuggerAgent.h
@@ -197,7 +197,7 @@ protected:
 
     virtual void enable();
     virtual void disable();
-    virtual SkipPauseRequest didPause(ScriptState*, const StackTrace& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
+    virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
     virtual void didContinue() OVERRIDE FINAL;
     void reset();
     void pageDidCommitLoad();
@@ -210,6 +210,8 @@ private:
     void addMessageToConsole(MessageSource, MessageType);
 
     PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCallFrames();
+    PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > callFrames(StackTraces, int asyncOrdinal);
+
     PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
 
     virtual void didParseSource(const String& scriptId, const Script&) OVERRIDE FINAL;
@@ -225,7 +227,7 @@ private:
 
     String sourceMapURLForScript(const Script&);
 
-    void collectAsyncCallStacks(Vector<StackTrace>& asyncCallStacks);
+    void collectAsyncCallStacks(Vector<StackTrace>& asyncCallStacks, ScriptState* scriptState);
 
     typedef HashMap<String, Script> ScriptsMap;
     typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpointIdsMap;
@@ -234,7 +236,7 @@ private:
     InjectedScriptManager* m_injectedScriptManager;
     InspectorFrontend::Debugger* m_frontend;
     RefPtr<ScriptState> m_pausedScriptState;
-    StackTrace m_currentCallStack;
+    StackTraces m_currentCallStack;
     ScriptsMap m_scripts;
     BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpointIds;
     DebugServerBreakpointToBreakpointIdAndSourceMap m_serverBreakpoints;