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

Unified Diff: content/renderer/v8_value_converter_impl.cc

Issue 753523002: remove some calls to to-be-deprecated v8::Value::To* functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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: content/renderer/v8_value_converter_impl.cc
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index 2c222bd772a9e5e965ae4e8b38e3c32b385334db..af3d974842158a42dd1743772dd2ed586621b420 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -296,26 +296,26 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
return base::Value::CreateNullValue();
if (val->IsBoolean())
- return new base::FundamentalValue(val->ToBoolean()->Value());
+ return new base::FundamentalValue(val->ToBoolean(isolate)->Value());
if (val->IsNumber() && strategy_) {
base::Value* out = NULL;
- if (strategy_->FromV8Number(val->ToNumber(), &out))
+ if (strategy_->FromV8Number(val.As<v8::Number>(), &out))
return out;
}
if (val->IsInt32())
- return new base::FundamentalValue(val->ToInt32()->Value());
+ return new base::FundamentalValue(val->ToInt32(isolate)->Value());
if (val->IsNumber()) {
- double val_as_double = val->ToNumber()->Value();
+ double val_as_double = val.As<v8::Number>()->Value();
if (!base::IsFinite(val_as_double))
return NULL;
return new base::FundamentalValue(val_as_double);
}
if (val->IsString()) {
- v8::String::Utf8Value utf8(val->ToString());
+ v8::String::Utf8Value utf8(val);
return new base::StringValue(std::string(*utf8, utf8.length()));
}
@@ -333,7 +333,7 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
if (!date_allowed_)
// JSON.stringify would convert this to a string, but an object is more
// consistent within this class.
- return FromV8Object(val->ToObject(), state, isolate);
+ return FromV8Object(val->ToObject(isolate), state, isolate);
v8::Date* date = v8::Date::Cast(*val);
return new base::FundamentalValue(date->ValueOf() / 1000.0);
}
@@ -341,8 +341,8 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
if (val->IsRegExp()) {
if (!reg_exp_allowed_)
// JSON.stringify converts to an object.
- return FromV8Object(val->ToObject(), state, isolate);
- return new base::StringValue(*v8::String::Utf8Value(val->ToString()));
+ return FromV8Object(val.As<v8::Object>(), state, isolate);
+ return new base::StringValue(*v8::String::Utf8Value(val));
}
// v8::Value doesn't have a ToArray() method for some reason.
@@ -353,14 +353,14 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
if (!function_allowed_)
// JSON.stringify refuses to convert function(){}.
return NULL;
- return FromV8Object(val->ToObject(), state, isolate);
+ return FromV8Object(val.As<v8::Object>(), state, isolate);
}
if (val->IsArrayBuffer() || val->IsArrayBufferView())
- return FromV8ArrayBuffer(val->ToObject(), isolate);
+ return FromV8ArrayBuffer(val.As<v8::Object>(), isolate);
if (val->IsObject())
- return FromV8Object(val->ToObject(), state, isolate);
+ return FromV8Object(val.As<v8::Object>(), state, isolate);
LOG(ERROR) << "Unexpected v8 value type encountered.";
return NULL;
@@ -507,7 +507,7 @@ base::Value* V8ValueConverterImpl::FromV8Object(
continue;
}
- v8::String::Utf8Value name_utf8(key->ToString());
+ v8::String::Utf8Value name_utf8(key);
v8::TryCatch try_catch;
v8::Handle<v8::Value> child_v8 = val->Get(key);
« no previous file with comments | « content/renderer/pepper/v8_var_converter_unittest.cc ('k') | content/shell/renderer/test_runner/test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698