Commit 618178fc authored by jochen's avatar jochen Committed by Commit bot

Replace FunctionToLocal with CallableToLocal

Because that's what it actually does

R=verwaest@chromium.org
BUG=none
LOG=n

Review URL: https://codereview.chromium.org/1410073005

Cr-Commit-Position: refs/heads/master@{#31563}
parent f714e483
......@@ -2009,7 +2009,7 @@ MaybeLocal<Function> ScriptCompiler::CompileFunctionInContext(
nullptr).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION(Function);
RETURN_ESCAPED(
Utils::FunctionToLocal(i::Handle<i::JSFunction>::cast(result)));
Utils::CallableToLocal(i::Handle<i::JSFunction>::cast(result)));
}
......@@ -4540,7 +4540,7 @@ Local<v8::Value> Function::GetBoundFunction() const {
i::BindingsArray::cast(func->function_bindings()));
i::Handle<i::Object> original(bound_args->bound_function(),
func->GetIsolate());
return Utils::FunctionToLocal(i::Handle<i::JSFunction>::cast(original));
return Utils::CallableToLocal(i::Handle<i::JSFunction>::cast(original));
}
......@@ -7768,7 +7768,7 @@ MaybeLocal<Value> Debug::GetMirror(Local<Context> context,
i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global_object());
auto name = isolate->factory()->NewStringFromStaticChars("MakeMirror");
auto fun_obj = i::Object::GetProperty(debug, name).ToHandleChecked();
auto v8_fun = Utils::FunctionToLocal(i::Handle<i::JSFunction>::cast(fun_obj));
auto v8_fun = Utils::CallableToLocal(i::Handle<i::JSFunction>::cast(fun_obj));
const int kArgc = 1;
v8::Local<v8::Value> argv[kArgc] = {obj};
Local<Value> result;
......
......@@ -267,7 +267,7 @@ class Utils {
v8::internal::Handle<v8::internal::JSObject> obj);
static inline Local<NativeWeakMap> NativeWeakMapToLocal(
v8::internal::Handle<v8::internal::JSWeakMap> obj);
static inline Local<Function> FunctionToLocal(
static inline Local<Function> CallableToLocal(
v8::internal::Handle<v8::internal::JSReceiver> obj);
#define DECLARE_OPEN_HANDLE(From, To) \
......@@ -379,7 +379,7 @@ MAKE_TO_LOCAL(IntegerToLocal, Object, Integer)
MAKE_TO_LOCAL(Uint32ToLocal, Object, Uint32)
MAKE_TO_LOCAL(ExternalToLocal, JSObject, External)
MAKE_TO_LOCAL(NativeWeakMapToLocal, JSWeakMap, NativeWeakMap)
MAKE_TO_LOCAL(FunctionToLocal, JSReceiver, Function)
MAKE_TO_LOCAL(CallableToLocal, JSReceiver, Function)
#undef MAKE_TO_LOCAL_TYPED_ARRAY
#undef MAKE_TO_LOCAL
......
......@@ -215,7 +215,7 @@ TEST(ContextLoadedFromActivation) {
i::Handle<i::JSFunction> jsfun = Handle<JSFunction>::cast(ofun);
jsfun->set_code(T.function->code());
jsfun->set_shared(T.function->shared());
context->Global()->Set(v8_str("foo"), v8::Utils::FunctionToLocal(jsfun));
context->Global()->Set(v8_str("foo"), v8::Utils::CallableToLocal(jsfun));
CompileRun("var x = 24;");
ExpectInt32("foo();", 24);
}
......@@ -237,7 +237,7 @@ TEST(BuiltinLoadedFromActivation) {
i::Handle<i::JSFunction> jsfun = Handle<JSFunction>::cast(ofun);
jsfun->set_code(T.function->code());
jsfun->set_shared(T.function->shared());
context->Global()->Set(v8_str("foo"), v8::Utils::FunctionToLocal(jsfun));
context->Global()->Set(v8_str("foo"), v8::Utils::CallableToLocal(jsfun));
CompileRun("var x = 24;");
ExpectObject("foo()", context->Global());
}
......@@ -161,7 +161,7 @@ TEST(StressJS) {
// Add the Foo constructor the global object.
env->Global()->Set(v8::String::NewFromUtf8(CcTest::isolate(), "Foo"),
v8::Utils::FunctionToLocal(function));
v8::Utils::CallableToLocal(function));
// Call the accessor through JavaScript.
v8::Handle<v8::Value> result = v8::Script::Compile(
v8::String::NewFromUtf8(CcTest::isolate(), "(new Foo).get"))->Run();
......
......@@ -5881,7 +5881,7 @@ TEST(Regress1878) {
CcTest::InitializeVM();
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope scope(isolate);
v8::Local<v8::Function> constructor = v8::Utils::FunctionToLocal(
v8::Local<v8::Function> constructor = v8::Utils::CallableToLocal(
CcTest::i_isolate()->internal_array_function());
CcTest::global()->Set(v8_str("InternalArray"), constructor);
......
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