| Index: Source/bindings/v8/ScriptDebugServer.cpp
|
| diff --git a/Source/bindings/v8/ScriptDebugServer.cpp b/Source/bindings/v8/ScriptDebugServer.cpp
|
| index 0e0d670a6e79d9076fccd4340c752e8e090780e9..7a408d78b3519dfc07ebbb1300e419e9fbd4e2b6 100644
|
| --- a/Source/bindings/v8/ScriptDebugServer.cpp
|
| +++ b/Source/bindings/v8/ScriptDebugServer.cpp
|
| @@ -330,9 +330,9 @@ ScriptValue ScriptDebugServer::currentCallFrame()
|
| v8::HandleScope handleScope(m_isolate);
|
| RefPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(m_executionState.newLocal(m_isolate), -1);
|
| if (!currentCallFrame)
|
| - return ScriptValue(v8::Null(m_isolate));
|
| + return ScriptValue(v8::Null(m_isolate), m_isolate);
|
| v8::Context::Scope contextScope(m_pausedContext);
|
| - return ScriptValue(toV8(currentCallFrame.release(), v8::Handle<v8::Object>(), m_pausedContext->GetIsolate()));
|
| + return ScriptValue(toV8(currentCallFrame.release(), v8::Handle<v8::Object>(), m_pausedContext->GetIsolate()), m_pausedContext->GetIsolate());
|
| }
|
|
|
| void ScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task, v8::Isolate* isolate)
|
| @@ -380,7 +380,7 @@ void ScriptDebugServer::handleProgramBreak(v8::Handle<v8::Object> executionState
|
|
|
| m_executionState.set(m_isolate, executionState);
|
| ScriptState* currentCallFrameState = ScriptState::forContext(m_pausedContext);
|
| - listener->didPause(currentCallFrameState, currentCallFrame(), ScriptValue(exception), breakpointIds);
|
| + listener->didPause(currentCallFrameState, currentCallFrame(), ScriptValue(exception, currentCallFrameState->isolate()), breakpointIds);
|
|
|
| m_runningNestedMessageLoop = true;
|
| runMessageLoopOnPause(m_pausedContext);
|
| @@ -602,12 +602,13 @@ void ScriptDebugServer::runScript(ScriptState* state, const String& scriptId, Sc
|
| *wasThrown = false;
|
| if (tryCatch.HasCaught()) {
|
| *wasThrown = true;
|
| - *result = ScriptValue(tryCatch.Exception());
|
| + *result = ScriptValue(tryCatch.Exception(), m_isolate);
|
| v8::Local<v8::Message> message = tryCatch.Message();
|
| if (!message.IsEmpty())
|
| *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
|
| - } else
|
| - *result = ScriptValue(value);
|
| + } else {
|
| + *result = ScriptValue(value, m_isolate);
|
| + }
|
| }
|
|
|
| PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(Frame*, const ScriptSourceCode&)
|
|
|