| Index: Source/bindings/v8/ScriptDebugServer.cpp
|
| diff --git a/Source/bindings/v8/ScriptDebugServer.cpp b/Source/bindings/v8/ScriptDebugServer.cpp
|
| index 11b48147d0ee3924ece7c3c9c4a8d2bfa450917e..ae4d2ca4d363739d5788983b5d99b1ace79930ed 100644
|
| --- a/Source/bindings/v8/ScriptDebugServer.cpp
|
| +++ b/Source/bindings/v8/ScriptDebugServer.cpp
|
| @@ -102,7 +102,7 @@ String ScriptDebugServer::setBreakpoint(const String& sourceID, const ScriptBrea
|
| return "";
|
| *actualLineNumber = info->Get(v8AtomicString(m_isolate, "lineNumber"))->Int32Value();
|
| *actualColumnNumber = info->Get(v8AtomicString(m_isolate, "columnNumber"))->Int32Value();
|
| - return toWebCoreString(breakpointId.As<v8::String>());
|
| + return toCoreString(breakpointId.As<v8::String>());
|
| }
|
|
|
| void ScriptDebugServer::removeBreakpoint(const String& breakpointId)
|
| @@ -275,7 +275,7 @@ bool ScriptDebugServer::setScriptSource(const String& sourceID, const String& ne
|
| if (tryCatch.HasCaught()) {
|
| v8::Local<v8::Message> message = tryCatch.Message();
|
| if (!message.IsEmpty())
|
| - *error = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
|
| + *error = toCoreStringWithUndefinedOrNullCheck(message->Get());
|
| else
|
| *error = "Unknown error.";
|
| return false;
|
| @@ -300,11 +300,11 @@ bool ScriptDebugServer::setScriptSource(const String& sourceID, const String& ne
|
| {
|
| RefPtr<TypeBuilder::Debugger::SetScriptSourceError::CompileError> compileError =
|
| TypeBuilder::Debugger::SetScriptSourceError::CompileError::create()
|
| - .setMessage(toWebCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
|
| + .setMessage(toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
|
| .setLineNumber(resultTuple->Get(3)->ToInteger()->Value())
|
| .setColumnNumber(resultTuple->Get(4)->ToInteger()->Value());
|
|
|
| - *error = toWebCoreStringWithUndefinedOrNullCheck(resultTuple->Get(1));
|
| + *error = toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(1));
|
| errorData = TypeBuilder::Debugger::SetScriptSourceError::create();
|
| errorData->setCompileError(compileError);
|
| return false;
|
| @@ -385,7 +385,7 @@ void ScriptDebugServer::handleProgramBreak(v8::Handle<v8::Object> executionState
|
| if (!hitBreakpointNumbers.IsEmpty()) {
|
| breakpointIds.resize(hitBreakpointNumbers->Length());
|
| for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++)
|
| - breakpointIds[i] = toWebCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
|
| + breakpointIds[i] = toCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
|
| }
|
|
|
| m_executionState.set(m_isolate, executionState);
|
| @@ -489,12 +489,12 @@ void ScriptDebugServer::handleV8DebugEvent(const v8::Debug::EventDetails& eventD
|
|
|
| void ScriptDebugServer::dispatchDidParseSource(ScriptDebugListener* listener, v8::Handle<v8::Object> object)
|
| {
|
| - String sourceID = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "id")));
|
| + String sourceID = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "id")));
|
|
|
| ScriptDebugListener::Script script;
|
| - script.url = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "name")));
|
| - script.source = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "source")));
|
| - script.sourceMappingURL = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "sourceMappingURL")));
|
| + script.url = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "name")));
|
| + script.source = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "source")));
|
| + script.sourceMappingURL = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "sourceMappingURL")));
|
| script.startLine = object->Get(v8AtomicString(m_isolate, "startLine"))->ToInteger()->Value();
|
| script.startColumn = object->Get(v8AtomicString(m_isolate, "startColumn"))->ToInteger()->Value();
|
| script.endLine = object->Get(v8AtomicString(m_isolate, "endLine"))->ToInteger()->Value();
|
| @@ -570,7 +570,7 @@ void ScriptDebugServer::compileScript(ScriptState* state, const String& expressi
|
| if (tryCatch.HasCaught()) {
|
| v8::Local<v8::Message> message = tryCatch.Message();
|
| if (!message.IsEmpty())
|
| - *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
|
| + *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
|
| return;
|
| }
|
| if (script.IsEmpty())
|
| @@ -608,7 +608,7 @@ void ScriptDebugServer::runScript(ScriptState* state, const String& scriptId, Sc
|
| *result = ScriptValue(tryCatch.Exception(), m_isolate);
|
| v8::Local<v8::Message> message = tryCatch.Message();
|
| if (!message.IsEmpty())
|
| - *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
|
| + *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
|
| } else {
|
| *result = ScriptValue(value, m_isolate);
|
| }
|
|
|