mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

chore: fix V8 deprecation warnings (#15842)

Browse source
This commit is contained in:
Milan Burda 2018-11-27 22:42:02 +01:00 • committed by Shelley Vohr
parent 455f0669e7
commit 81e00d8e56
9 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/native_mate_converters/string16_converter.h
View file

@ -24,7 +24,7 @@ struct Converter<base::string16> {
if (!val->IsString())
return false;
v8::String::Value s(val);
v8::String::Value s(isolate, val);
out->assign(reinterpret_cast<const base::char16*>(*s), s.length());
return true;
}

14
atom/common/native_mate_converters/v8_value_converter.cc
View file

@ -317,7 +317,8 @@ base::Value* V8ValueConverter::FromV8ValueImpl(FromV8ValueState* state,
}
if (val->IsString()) {
v8::String::Utf8Value utf8(val->ToString(context).ToLocalChecked());
v8::String::Utf8Value utf8(isolate,
val->ToString(context).ToLocalChecked());
return new base::Value(std::string(*utf8, utf8.length()));
}
@ -333,7 +334,8 @@ base::Value* V8ValueConverter::FromV8ValueImpl(FromV8ValueState* state,
v8::Local<v8::Value> result =
toISOString.As<v8::Function>()->Call(val, 0, nullptr);
if (!result.IsEmpty()) {
v8::String::Utf8Value utf8(result->ToString(context).ToLocalChecked());
v8::String::Utf8Value utf8(isolate,
result->ToString(context).ToLocalChecked());
return new base::Value(std::string(*utf8, utf8.length()));
}
}
@ -344,8 +346,8 @@ base::Value* V8ValueConverter::FromV8ValueImpl(FromV8ValueState* state,
// JSON.stringify converts to an object.
return FromV8Object(val->ToObject(context).ToLocalChecked(), state,
isolate);
return new base::Value(
*v8::String::Utf8Value(val->ToString(context).ToLocalChecked()));
return new base::Value(*v8::String::Utf8Value(
isolate, val->ToString(context).ToLocalChecked()));
}
// v8::Value doesn't have a ToArray() method for some reason.
@ -442,14 +444,14 @@ base::Value* V8ValueConverter::FromV8Object(v8::Local<v8::Object> val,
// Extend this test to cover more types as necessary and if sensible.
if (!key->IsString() && !key->IsNumber()) {
NOTREACHED() << "Key \"" << *v8::String::Utf8Value(key)
NOTREACHED() << "Key \"" << *v8::String::Utf8Value(isolate, key)
<< "\" "
"is neither a string nor a number";
continue;
}
v8::String::Utf8Value name_utf8(
key->ToString(isolate->GetCurrentContext()).ToLocalChecked());
isolate, key->ToString(isolate->GetCurrentContext()).ToLocalChecked());
v8::TryCatch try_catch(isolate);
v8::Local<v8::Value> child_v8 = val->Get(key);