Commit fa5f184f authored by Ross McIlroy's avatar Ross McIlroy Committed by Commit Bot

[Cleanup] Avoid using deprecated v8::Function::Call in extensions/script_context.

BUG=v8:7290,v8:8238

Change-Id: I4d9e49dead34f9fddc47222c723c38c6ed11b3b0
Reviewed-on: https://chromium-review.googlesource.com/c/1349318Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610813}
parent 05522106
...@@ -193,9 +193,10 @@ void ScriptContext::SafeCallFunction( ...@@ -193,9 +193,10 @@ void ScriptContext::SafeCallFunction(
web_frame_->RequestExecuteV8Function(v8_context(), function, global, argc, web_frame_->RequestExecuteV8Function(v8_context(), function, global, argc,
argv, wrapper_callback); argv, wrapper_callback);
} else { } else {
// TODO(devlin): This probably isn't safe. v8::MaybeLocal<v8::Value> maybe_result =
v8::Local<v8::Value> result = function->Call(global, argc, argv); function->Call(v8_context(), global, argc, argv);
if (!callback.is_null()) { v8::Local<v8::Value> result;
if (!callback.is_null() && maybe_result.ToLocal(&result)) {
std::vector<v8::Local<v8::Value>> results(1, result); std::vector<v8::Local<v8::Value>> results(1, result);
callback.Run(results); callback.Run(results);
} }
...@@ -518,8 +519,16 @@ v8::Local<v8::Value> ScriptContext::CallFunction( ...@@ -518,8 +519,16 @@ v8::Local<v8::Value> ScriptContext::CallFunction(
} }
v8::Local<v8::Object> global = v8_context()->Global(); v8::Local<v8::Object> global = v8_context()->Global();
if (!web_frame_) if (!web_frame_) {
return handle_scope.Escape(function->Call(global, argc, argv)); v8::MaybeLocal<v8::Value> maybe_result =
function->Call(v8_context(), global, argc, argv);
v8::Local<v8::Value> result;
if (!maybe_result.ToLocal(&result)) {
return handle_scope.Escape(
v8::Local<v8::Primitive>(v8::Undefined(isolate())));
}
return handle_scope.Escape(result);
}
v8::MaybeLocal<v8::Value> result = v8::MaybeLocal<v8::Value> result =
web_frame_->CallFunctionEvenIfScriptDisabled(function, global, argc, web_frame_->CallFunctionEvenIfScriptDisabled(function, global, argc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment