Support merged Dart-JS callstacks

Source/bindings/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-2011 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 223 matching lines @@
 void ScriptDebugServer::stepOutOfFunction()
 {
     ASSERT(isPaused());
     ASSERT(!m_executionState.IsEmpty());
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Value> argv[] = { m_executionState };
     callDebuggerMethod(stepOutV8MethodName, 1, argv);
     continueProgram();
 }
 
-bool ScriptDebugServer::setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, StackTrace* newCallFrames, RefPtr<JSONObject>* result)
+bool ScriptDebugServer::setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, StackTraces* newCallFrames, RefPtr<JSONObject>* result)
 {
     class EnableLiveEditScope {
     public:
         explicit EnableLiveEditScope(v8::Isolate* isolate) : m_isolate(isolate) { v8::Debug::SetLiveEditEnabled(m_isolate, true); }
         ~EnableLiveEditScope() { v8::Debug::SetLiveEditEnabled(m_isolate, false); }
     private:
         v8::Isolate* m_isolate;
     };
 
     ensureDebuggerScriptCompiled();
@@ skipping 25 matching lines @@
     v8::Local<v8::Object> resultTuple = v8result->ToObject();
     int code = static_cast<int>(resultTuple->Get(0)->ToInteger()->Value());
     switch (code) {
     case 0:
         {
             v8::Local<v8::Value> normalResult = resultTuple->Get(1);
             RefPtr<JSONValue> jsonResult = v8ToJSONValue(m_isolate, normalResult, JSONValue::maxDepth);
             if (jsonResult)
                 *result = jsonResult->asObject();
             // Call stack may have changed after if the edited function was on the stack.
-            if (!preview && isPaused())
-                *newCallFrames = currentCallFrames();
+            if (!preview && isAnyScriptPaused())
+                newCallFrames->add(currentCallFrames());
             return true;
         }
     // Compile error.
     case 1:
         {
             RefPtr<TypeBuilder::Debugger::SetScriptSourceError::CompileError> compileError =
                 TypeBuilder::Debugger::SetScriptSourceError::CompileError::create()
                     .setMessage(toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
                     .setLineNumber(resultTuple->Get(3)->ToInteger()->Value())
                     .setColumnNumber(resultTuple->Get(4)->ToInteger()->Value());
@@ skipping 33 matching lines @@
     } else {
         v8::Handle<v8::Value> argv[] = { m_executionState, v8::Integer::New(m_isolate, data) };
         currentCallFrameV8 = callDebuggerMethod("currentCallFrame", WTF_ARRAY_LENGTH(argv), argv);
     }
     ASSERT(!currentCallFrameV8.IsEmpty());
     if (!currentCallFrameV8->IsObject())
         return nullptr;
     return JavaScriptCallFrame::create(v8::Debug::GetDebugContext(), v8::Handle<v8::Object>::Cast(currentCallFrameV8));
 }
 
-StackTrace ScriptDebugServer::currentCallFramesInner(ScopeInfoDetails scopeDetails)
+StackTraces ScriptDebugServer::currentCallFramesInner(ScopeInfoDetails scopeDetails)
 {
     if (!m_isolate->InContext())
-        return StackTrace(ScriptValue());
+        return StackTraces();
     v8::HandleScope handleScope(m_isolate);
 
     RefPtrWillBeRawPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(0, scopeDetails);
     if (!currentCallFrame)
-        return StackTrace(ScriptValue());
+        return StackTraces();
 
     V8ScriptState* scriptState = m_pausedScriptState ? m_pausedScriptState->v8ScriptState() : V8ScriptState::current(m_isolate);
     V8ScriptState::Scope scope(scriptState);
-    return StackTrace(ScriptValue(scriptState, toV8(currentCallFrame.release(), scriptState->context()->Global(), m_isolate)));
+    return StackTraces(StackTrace(ScriptValue(scriptState, toV8(currentCallFrame.release(), scriptState->context()->Global(), m_isolate))), scriptState);
 }
 
-StackTrace ScriptDebugServer::currentCallFrames()
+
+StackTraces ScriptDebugServer::currentCallFrames()
 {
     return currentCallFramesInner(AllScopes);
 }
 
-StackTrace ScriptDebugServer::currentCallFramesForAsyncStack()
+StackTraces ScriptDebugServer::currentCallFramesForAsyncStack()
 {
     return currentCallFramesInner(FastAsyncScopes);
 }
 
 ScriptCallFrame ScriptDebugServer::topCallFrameNoScopes()
 {
     RefPtrWillBeRawPtr<JavaScriptCallFrame> jsCallFrame = wrapCallFrames(1, NoScopes);
     if (!jsCallFrame)
         return ScriptCallFrame();
     return ScriptCallFrame(jsCallFrame->functionName(),
@@ skipping 43 matching lines @@
         breakpointIds.resize(hitBreakpointNumbers->Length());
         for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++) {
             v8::Handle<v8::Value> hitBreakpointNumber = hitBreakpointNumbers->Get(i);
             ASSERT(!hitBreakpointNumber.IsEmpty() && hitBreakpointNumber->IsInt32());
             breakpointIds[i] = String::number(hitBreakpointNumber->Int32Value());
         }
     }
 
     m_pausedScriptState = pausedScriptState;
     m_executionState = executionState;
-    ScriptDebugListener::SkipPauseRequest result = listener->didPause(pausedScriptState, currentCallFrames(), ScriptValue(pausedScriptState->v8ScriptState(), exception), breakpointIds);
+
+    ScriptDebugListener::SkipPauseRequest result = listener->didPause(pausedScriptState, ScriptValue(pausedScriptState->v8ScriptState(), exception), breakpointIds);
     if (result == ScriptDebugListener::NoSkip) {
         m_runningNestedMessageLoop = true;
         runMessageLoopOnPause(pausedScriptState->v8ScriptState()->context());
         m_runningNestedMessageLoop = false;
     }
     m_pausedScriptState.clear();
     m_executionState.Clear();
 
     if (result == ScriptDebugListener::StepInto) {
         v8::Handle<v8::Value> argv[] = { executionState };
@@ skipping 204 matching lines @@
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore