Index: Source/bindings/v8/ScriptDebugServer.cpp |
diff --git a/Source/bindings/v8/ScriptDebugServer.cpp b/Source/bindings/v8/ScriptDebugServer.cpp |
index 0c61ce7494e9737c677e1026a26de1b3585053ff..8b69e9ca14cf05d64aa9f71c341b2dd765585648 100644 |
--- a/Source/bindings/v8/ScriptDebugServer.cpp |
+++ b/Source/bindings/v8/ScriptDebugServer.cpp |
@@ -345,20 +345,26 @@ PassRefPtrWillBeRawPtr<JavaScriptCallFrame> ScriptDebugServer::wrapCallFrames(in |
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); |
} |