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 327 matching lines @@
     }
     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)
 {
     if (!m_isolate->InContext())
-        return StackTrace(ScriptValue());
+        return StackTrace();
     v8::HandleScope handleScope(m_isolate);
 
     RefPtrWillBeRawPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(0, scopeDetails);
     if (!currentCallFrame)
-        return StackTrace(ScriptValue());
+        return StackTrace();
 
     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 StackTrace(ScriptValue(scriptState, toV8(currentCallFrame.release(), scriptState->context()->Global(), m_isolate)), scriptState);
 }
 
+
 StackTrace ScriptDebugServer::currentCallFrames()
 {
+    return StackTrace(currentCallFramesForVm(), m_peer->currentCallFramesForVm());
+}
+
+StackTrace ScriptDebugServer::currentCallFramesForVm()
+{
     return currentCallFramesInner(AllScopes);
 }
 
 StackTrace ScriptDebugServer::currentCallFramesForAsyncStack()
 {
     return currentCallFramesInner(FastAsyncScopes);
 }
 
 ScriptCallFrame ScriptDebugServer::topCallFrameNoScopes()
 {
@@ skipping 272 matching lines @@
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore