Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1082)

Unified Diff: Source/core/inspector/JavaScriptCallFrame.cpp

Issue 1027593003: bindings: Use Maybe version of v8::String::NewFromUtf8() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/JavaScriptCallFrame.cpp
diff --git a/Source/core/inspector/JavaScriptCallFrame.cpp b/Source/core/inspector/JavaScriptCallFrame.cpp
index 5369ca566f83786ef2ad1a3894bc225247aad332..aee34ecb4536150c0d1ffeed66196598bcd43908 100644
--- a/Source/core/inspector/JavaScriptCallFrame.cpp
+++ b/Source/core/inspector/JavaScriptCallFrame.cpp
@@ -178,11 +178,11 @@ ScriptValue JavaScriptCallFrame::evaluateWithExceptionDetails(ScriptState* scrip
v8::Local<v8::Object> wrappedResult = v8::Object::New(m_isolate);
if (tryCatch.HasCaught()) {
- wrappedResult->Set(v8::String::NewFromUtf8(m_isolate, "result"), tryCatch.Exception());
- wrappedResult->Set(v8::String::NewFromUtf8(m_isolate, "exceptionDetails"), createExceptionDetails(m_isolate, tryCatch.Message()));
+ wrappedResult->Set(v8NormalString(m_isolate, "result"), tryCatch.Exception());
+ wrappedResult->Set(v8NormalString(m_isolate, "exceptionDetails"), createExceptionDetails(m_isolate, tryCatch.Message()));
} else {
- wrappedResult->Set(v8::String::NewFromUtf8(m_isolate, "result"), result);
- wrappedResult->Set(v8::String::NewFromUtf8(m_isolate, "exceptionDetails"), v8::Undefined(m_isolate));
+ wrappedResult->Set(v8NormalString(m_isolate, "result"), result);
+ wrappedResult->Set(v8NormalString(m_isolate, "exceptionDetails"), v8::Undefined(m_isolate));
}
return ScriptValue(scriptState, wrappedResult);
}
@@ -213,15 +213,15 @@ ScriptValue JavaScriptCallFrame::setVariableValue(ScriptState* scriptState, int
v8::Local<v8::Object> JavaScriptCallFrame::createExceptionDetails(v8::Isolate* isolate, v8::Local<v8::Message> message)
{
v8::Local<v8::Object> exceptionDetails = v8::Object::New(isolate);
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "text"), message->Get());
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "url"), message->GetScriptOrigin().ResourceName());
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "scriptId"), v8::Integer::New(isolate, message->GetScriptOrigin().ScriptID()->Value()));
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "line"), v8::Integer::New(isolate, message->GetLineNumber()));
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "column"), v8::Integer::New(isolate, message->GetStartColumn()));
+ exceptionDetails->Set(v8NormalString(isolate, "text"), message->Get());
+ exceptionDetails->Set(v8NormalString(isolate, "url"), message->GetScriptOrigin().ResourceName());
+ exceptionDetails->Set(v8NormalString(isolate, "scriptId"), v8::Integer::New(isolate, message->GetScriptOrigin().ScriptID()->Value()));
+ exceptionDetails->Set(v8NormalString(isolate, "line"), v8::Integer::New(isolate, message->GetLineNumber()));
+ exceptionDetails->Set(v8NormalString(isolate, "column"), v8::Integer::New(isolate, message->GetStartColumn()));
if (!message->GetStackTrace().IsEmpty())
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "stackTrace"), message->GetStackTrace()->AsArray());
+ exceptionDetails->Set(v8NormalString(isolate, "stackTrace"), message->GetStackTrace()->AsArray());
else
- exceptionDetails->Set(v8::String::NewFromUtf8(isolate, "stackTrace"), v8::Undefined(isolate));
+ exceptionDetails->Set(v8NormalString(isolate, "stackTrace"), v8::Undefined(isolate));
return exceptionDetails;
}

Powered by Google App Engine
This is Rietveld 408576698