Support merged Dart-JS callstacks

Source/bindings/dart/DartScriptDebugServer.h

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 172 matching lines @@
     virtual void setPauseOnExceptionsState(ScriptDebugServer::PauseOnExceptionsState);
 
     virtual void setPauseOnNextStatement(bool);
     virtual bool canBreakProgram();
     virtual void breakProgram();
     virtual void continueProgram();
     virtual void stepIntoStatement();
     virtual void stepOverStatement();
     virtual void stepOutOfFunction();
 
-    virtual bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result);
+    virtual bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, StackTraces* newCallFrames, RefPtr<JSONObject>* result);
     virtual ScriptCallFrame topCallFrameNoScopes();
     virtual int frameCount();
-    virtual StackTrace currentCallFrames();
-    virtual StackTrace currentCallFramesForAsyncStack();
+    virtual StackTraces currentCallFrames();
+    virtual StackTraces currentCallFramesForAsyncStack();
 
     virtual bool isPaused();
     virtual bool runningNestedMessageLoop() { return m_runningNestedMessageLoop; }
 
     virtual void clearCompiledScripts();
     virtual void setPreprocessorSource(const String&);
     virtual PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&);
     virtual String preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName);
     virtual void runScript(ScriptState*, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace);
     virtual bool canPreprocess(LocalFrame*);
@@ skipping 34 matching lines @@
     void cancelDebugBreak();
     Page* inferPage(Dart_Isolate);
 
     Vector<Dart_Isolate> isolates();
     Vector<DartPageDebug*> pages();
 
     ScriptDebugServer::PauseOnExceptionsState m_pauseOnExceptionState;
     bool m_breakpointsActivated;
     bool m_runningNestedMessageLoop;
     Dart_StackTrace m_executionState;
+    bool m_isPaused;
     Dart_Isolate m_pausedIsolate;
     Page* m_pausedPage;
     HashSet<Dart_Isolate> m_interruptCalled;
     HashSet<Dart_Isolate> m_interruptCancelled;
 
     typedef HashMap<int, DartPageDebug*> DebugDataMap;
     DebugDataMap m_pageIdToDebugDataMap;
     typedef HashMap<Page*, int> PageToIdMap;
     PageToIdMap m_pageToIdMap;
 
@@ skipping 21 matching lines @@
     virtual void setPauseOnExceptionsState(ScriptDebugServer::PauseOnExceptionsState);
 
     virtual void setPauseOnNextStatement(bool);
     virtual bool canBreakProgram();
     virtual void breakProgram();
     virtual void continueProgram();
     virtual void stepIntoStatement();
     virtual void stepOverStatement();
     virtual void stepOutOfFunction();
 
-    virtual bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result);
+    virtual bool setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, StackTraces* newCallFrames, RefPtr<JSONObject>* result);
 
     virtual ScriptCallFrame topCallFrameNoScopes();
     virtual int frameCount();
-    virtual StackTrace currentCallFrames();
-    virtual StackTrace currentCallFramesForAsyncStack();
+    virtual StackTraces currentCallFrames();
+    virtual StackTraces currentCallFramesForAsyncStack();
 
     virtual bool isPaused();
     virtual bool runningNestedMessageLoop();
 
     virtual void clearCompiledScripts();
     virtual void setPreprocessorSource(const String&);
 
     // FIXMEDART: this signature is v8 specific.
     virtual void preprocessBeforeCompile(const v8::Debug::EventDetails&);
     virtual PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&);
@@ skipping 12 matching lines @@
 
     bool isDartSourceID(const String& sourceID);
     bool isDartBreakpointId(const String& breakpointId);
     DartScriptDebugServer* m_dart;
     PageScriptDebugServer* m_v8;
 };
 
 }
 
 #endif // DartScriptDebugServer_h