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

Unified Diff: third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp

Issue 1767883002: DevTools: generate string16-based handlers for v8_inspector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for landing 2 Created 4 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: third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp b/third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp
index e752b66cc80ee22f426b79d7b7838902678feb4e..6222e7debd1973e95219f2a519e8fbcfb77e170c 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/JavaScriptCallFrame.cpp
@@ -72,7 +72,7 @@ int JavaScriptCallFrame::callV8FunctionReturnInt(const char* name) const
return result.As<v8::Int32>()->Value();
}
-String JavaScriptCallFrame::callV8FunctionReturnString(const char* name) const
+String16 JavaScriptCallFrame::callV8FunctionReturnString(const char* name) const
{
v8::HandleScope handleScope(m_isolate);
v8::Context::Scope contextScope(v8::Local<v8::Context>::New(m_isolate, m_debuggerContext));
@@ -80,8 +80,8 @@ String JavaScriptCallFrame::callV8FunctionReturnString(const char* name) const
v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(callFrame->Get(toV8StringInternalized(m_isolate, name)));
v8::Local<v8::Value> result;
if (!m_client->callInternalFunction(func, callFrame, 0, nullptr).ToLocal(&result))
- return String();
- return toWTFStringWithTypeCheck(result);
+ return String16();
+ return toProtocolStringWithTypeCheck(result);
}
int JavaScriptCallFrame::sourceID() const
@@ -99,12 +99,12 @@ int JavaScriptCallFrame::column() const
return callV8FunctionReturnInt("column");
}
-String JavaScriptCallFrame::scriptName() const
+String16 JavaScriptCallFrame::scriptName() const
{
return callV8FunctionReturnString("scriptName");
}
-String JavaScriptCallFrame::functionName() const
+String16 JavaScriptCallFrame::functionName() const
{
return callV8FunctionReturnString("functionName");
}
@@ -169,7 +169,7 @@ v8::Local<v8::Value> JavaScriptCallFrame::thisObject() const
return v8::Local<v8::Object>::New(m_isolate, m_callFrame)->Get(toV8StringInternalized(m_isolate, "thisObject"));
}
-String JavaScriptCallFrame::stepInPositions() const
+String16 JavaScriptCallFrame::stepInPositions() const
{
return callV8FunctionReturnString("stepInPositions");
}

Powered by Google App Engine
This is Rietveld 408576698