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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 766103003: [Inspector] Deprecate usage of v8::Handle with v8::Local as replacement. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « Source/core/inspector/JavaScriptCallFrame.h ('k') | Source/core/inspector/PromiseTracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/JavaScriptCallFrame.cpp
diff --git a/Source/core/inspector/JavaScriptCallFrame.cpp b/Source/core/inspector/JavaScriptCallFrame.cpp
index 4ea0057ae25797655e398388efc51326ff9e421f..74dbcd504b454de77b9735cf9cb6e1cf35225f01 100644
--- a/Source/core/inspector/JavaScriptCallFrame.cpp
+++ b/Source/core/inspector/JavaScriptCallFrame.cpp
@@ -37,7 +37,7 @@
namespace blink {
-JavaScriptCallFrame::JavaScriptCallFrame(v8::Handle<v8::Context> debuggerContext, v8::Handle<v8::Object> callFrame)
+JavaScriptCallFrame::JavaScriptCallFrame(v8::Local<v8::Context> debuggerContext, v8::Local<v8::Object> callFrame)
: m_isolate(v8::Isolate::GetCurrent())
, m_debuggerContext(m_isolate, debuggerContext)
, m_callFrame(m_isolate, callFrame)
@@ -52,12 +52,12 @@ JavaScriptCallFrame* JavaScriptCallFrame::caller()
{
if (!m_caller) {
v8::HandleScope handleScope(m_isolate);
- v8::Handle<v8::Context> debuggerContext = m_debuggerContext.newLocal(m_isolate);
+ v8::Local<v8::Context> debuggerContext = m_debuggerContext.newLocal(m_isolate);
v8::Context::Scope contextScope(debuggerContext);
- v8::Handle<v8::Value> callerFrame = m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "caller"));
+ v8::Local<v8::Value> callerFrame = m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "caller"));
if (callerFrame.IsEmpty() || !callerFrame->IsObject())
return 0;
- m_caller = JavaScriptCallFrame::create(debuggerContext, v8::Handle<v8::Object>::Cast(callerFrame));
+ m_caller = JavaScriptCallFrame::create(debuggerContext, v8::Local<v8::Object>::Cast(callerFrame));
}
return m_caller.get();
}
@@ -66,9 +66,9 @@ int JavaScriptCallFrame::callV8FunctionReturnInt(const char* name) const
{
v8::HandleScope handleScope(m_isolate);
v8::Context::Scope contextScope(m_debuggerContext.newLocal(m_isolate));
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, name)));
- v8::Handle<v8::Value> result = func->Call(callFrame, 0, 0);
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, name)));
+ v8::Local<v8::Value> result = func->Call(callFrame, 0, 0);
if (result.IsEmpty() || !result->IsInt32())
return 0;
return result->Int32Value();
@@ -78,9 +78,9 @@ String JavaScriptCallFrame::callV8FunctionReturnString(const char* name) const
{
v8::HandleScope handleScope(m_isolate);
v8::Context::Scope contextScope(m_debuggerContext.newLocal(m_isolate));
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, name)));
- v8::Handle<v8::Value> result = func->Call(callFrame, 0, 0);
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, name)));
+ v8::Local<v8::Value> result = func->Call(callFrame, 0, 0);
return toCoreStringWithUndefinedOrNullCheck(result);
}
@@ -109,12 +109,12 @@ String JavaScriptCallFrame::functionName() const
return callV8FunctionReturnString("functionName");
}
-v8::Handle<v8::Value> JavaScriptCallFrame::scopeChain() const
+v8::Local<v8::Value> JavaScriptCallFrame::scopeChain() const
{
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "scopeChain")));
- v8::Handle<v8::Array> scopeChain = v8::Handle<v8::Array>::Cast(func->Call(callFrame, 0, 0));
- v8::Handle<v8::Array> result = v8::Array::New(m_isolate, scopeChain->Length());
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "scopeChain")));
+ v8::Local<v8::Array> scopeChain = v8::Local<v8::Array>::Cast(func->Call(callFrame, 0, 0));
+ v8::Local<v8::Array> result = v8::Array::New(m_isolate, scopeChain->Length());
for (uint32_t i = 0; i < scopeChain->Length(); i++)
result->Set(i, scopeChain->Get(i));
return result;
@@ -122,13 +122,13 @@ v8::Handle<v8::Value> JavaScriptCallFrame::scopeChain() const
int JavaScriptCallFrame::scopeType(int scopeIndex) const
{
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "scopeType")));
- v8::Handle<v8::Array> scopeType = v8::Handle<v8::Array>::Cast(func->Call(callFrame, 0, 0));
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "scopeType")));
+ v8::Local<v8::Array> scopeType = v8::Local<v8::Array>::Cast(func->Call(callFrame, 0, 0));
return scopeType->Get(scopeIndex)->Int32Value();
}
-v8::Handle<v8::Value> JavaScriptCallFrame::thisObject() const
+v8::Local<v8::Value> JavaScriptCallFrame::thisObject() const
{
return m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "thisObject"));
}
@@ -142,13 +142,13 @@ bool JavaScriptCallFrame::isAtReturn() const
{
v8::HandleScope handleScope(m_isolate);
v8::Context::Scope contextScope(m_debuggerContext.newLocal(m_isolate));
- v8::Handle<v8::Value> result = m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "isAtReturn"));
+ v8::Local<v8::Value> result = m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "isAtReturn"));
if (result.IsEmpty() || !result->IsBoolean())
return false;
return result->BooleanValue();
}
-v8::Handle<v8::Value> JavaScriptCallFrame::returnValue() const
+v8::Local<v8::Value> JavaScriptCallFrame::returnValue() const
{
return m_callFrame.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "returnValue"));
}
@@ -156,16 +156,16 @@ v8::Handle<v8::Value> JavaScriptCallFrame::returnValue() const
ScriptValue JavaScriptCallFrame::evaluateWithExceptionDetails(ScriptState* scriptState, const String& expression, const ScriptValue& scopeExtension)
{
ScriptState::Scope scriptScope(scriptState);
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> evalFunction = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "evaluate")));
- v8::Handle<v8::Value> argv[] = {
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> evalFunction = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "evaluate")));
+ v8::Local<v8::Value> argv[] = {
v8String(m_debuggerContext.newLocal(m_isolate)->GetIsolate(), expression),
scopeExtension.isEmpty() ? v8::Handle<v8::Value>::Cast(v8::Undefined(m_isolate)) : scopeExtension.v8Value()
};
v8::TryCatch tryCatch;
- v8::Handle<v8::Value> result = evalFunction->Call(callFrame, WTF_ARRAY_LENGTH(argv), argv);
+ v8::Local<v8::Value> result = evalFunction->Call(callFrame, WTF_ARRAY_LENGTH(argv), argv);
- v8::Handle<v8::Object> wrappedResult = v8::Object::New(m_isolate);
+ 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()));
@@ -176,12 +176,12 @@ ScriptValue JavaScriptCallFrame::evaluateWithExceptionDetails(ScriptState* scrip
return ScriptValue(scriptState, wrappedResult);
}
-v8::Handle<v8::Value> JavaScriptCallFrame::restart()
+v8::Local<v8::Value> JavaScriptCallFrame::restart()
{
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> restartFunction = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "restart")));
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> restartFunction = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "restart")));
v8::Debug::SetLiveEditEnabled(m_isolate, true);
- v8::Handle<v8::Value> result = restartFunction->Call(callFrame, 0, 0);
+ v8::Local<v8::Value> result = restartFunction->Call(callFrame, 0, 0);
v8::Debug::SetLiveEditEnabled(m_isolate, false);
return result;
}
@@ -189,19 +189,19 @@ v8::Handle<v8::Value> JavaScriptCallFrame::restart()
ScriptValue JavaScriptCallFrame::setVariableValue(ScriptState* scriptState, int scopeNumber, const String& variableName, const ScriptValue& newValue)
{
ScriptState::Scope scriptScope(scriptState);
- v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
- v8::Handle<v8::Function> setVariableValueFunction = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "setVariableValue")));
- v8::Handle<v8::Value> argv[] = {
- v8::Handle<v8::Value>(v8::Integer::New(m_isolate, scopeNumber)),
+ v8::Local<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
+ v8::Local<v8::Function> setVariableValueFunction = v8::Local<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "setVariableValue")));
+ v8::Local<v8::Value> argv[] = {
+ v8::Local<v8::Value>(v8::Integer::New(m_isolate, scopeNumber)),
v8String(m_isolate, variableName),
newValue.v8Value()
};
return ScriptValue(scriptState, setVariableValueFunction->Call(callFrame, WTF_ARRAY_LENGTH(argv), argv));
}
-v8::Handle<v8::Object> JavaScriptCallFrame::createExceptionDetails(v8::Isolate* isolate, v8::Handle<v8::Message> message)
+v8::Local<v8::Object> JavaScriptCallFrame::createExceptionDetails(v8::Isolate* isolate, v8::Local<v8::Message> message)
{
- v8::Handle<v8::Object> exceptionDetails = v8::Object::New(isolate);
+ 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()));
« no previous file with comments | « Source/core/inspector/JavaScriptCallFrame.h ('k') | Source/core/inspector/PromiseTracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698