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

Unified Diff: content/renderer/pepper/v8_var_converter_unittest.cc

Issue 1113783002: Use Local instead of Handle in src/content/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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 | « content/renderer/pepper/v8_var_converter.cc ('k') | content/renderer/pepper/v8object_var.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/v8_var_converter_unittest.cc
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc
index c0032ad38b934bc1109cdc990aefa9c19ecabb57..9f4ff1f66bf1238986b2d0613faadd3a8429062c 100644
--- a/content/renderer/pepper/v8_var_converter_unittest.cc
+++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -56,25 +56,25 @@ class MockResourceConverter : public content::ResourceConverter {
void Flush(const base::Callback<void(bool)>& callback) override {
NOTREACHED();
}
- bool FromV8Value(v8::Handle<v8::Object> val,
- v8::Handle<v8::Context> context,
+ bool FromV8Value(v8::Local<v8::Object> val,
+ v8::Local<v8::Context> context,
PP_Var* result,
bool* was_resource) override {
*was_resource = false;
return true;
}
bool ToV8Value(const PP_Var& var,
- v8::Handle<v8::Context> context,
- v8::Handle<v8::Value>* result) override {
+ v8::Local<v8::Context> context,
+ v8::Local<v8::Value>* result) override {
return false;
}
};
// Maps PP_Var IDs to the V8 value handle they correspond to.
-typedef base::hash_map<int64_t, v8::Handle<v8::Value> > VarHandleMap;
+typedef base::hash_map<int64_t, v8::Local<v8::Value> > VarHandleMap;
bool Equals(const PP_Var& var,
- v8::Handle<v8::Value> val,
+ v8::Local<v8::Value> val,
VarHandleMap* visited_ids) {
if (ppapi::VarTracker::IsVarTypeRefcounted(var.type)) {
VarHandleMap::iterator it = visited_ids->find(var.value.as_id);
@@ -110,11 +110,11 @@ bool Equals(const PP_Var& var,
return false;
ArrayVar* array_var = ArrayVar::FromPPVar(var);
DCHECK(array_var);
- v8::Handle<v8::Array> v8_array = val.As<v8::Array>();
+ v8::Local<v8::Array> v8_array = val.As<v8::Array>();
if (v8_array->Length() != array_var->elements().size())
return false;
for (uint32 i = 0; i < v8_array->Length(); ++i) {
- v8::Handle<v8::Value> child_v8 = v8_array->Get(i);
+ v8::Local<v8::Value> child_v8 = v8_array->Get(i);
if (!Equals(array_var->elements()[i].get(), child_v8, visited_ids))
return false;
}
@@ -125,20 +125,20 @@ bool Equals(const PP_Var& var,
NOTIMPLEMENTED();
return false;
} else {
- v8::Handle<v8::Object> v8_object = val.As<v8::Object>();
+ v8::Local<v8::Object> v8_object = val.As<v8::Object>();
if (var.type != PP_VARTYPE_DICTIONARY)
return false;
DictionaryVar* dict_var = DictionaryVar::FromPPVar(var);
DCHECK(dict_var);
- v8::Handle<v8::Array> property_names(v8_object->GetOwnPropertyNames());
+ v8::Local<v8::Array> property_names(v8_object->GetOwnPropertyNames());
if (property_names->Length() != dict_var->key_value_map().size())
return false;
for (uint32 i = 0; i < property_names->Length(); ++i) {
- v8::Handle<v8::Value> key(property_names->Get(i));
+ v8::Local<v8::Value> key(property_names->Get(i));
if (!key->IsString() && !key->IsNumber())
return false;
- v8::Handle<v8::Value> child_v8 = v8_object->Get(key);
+ v8::Local<v8::Value> child_v8 = v8_object->Get(key);
v8::String::Utf8Value name_utf8(key);
ScopedPPVar release_key(ScopedPPVar::PassRef(),
@@ -157,7 +157,7 @@ bool Equals(const PP_Var& var,
return false;
}
-bool Equals(const PP_Var& var, v8::Handle<v8::Value> val) {
+bool Equals(const PP_Var& var, v8::Local<v8::Value> val) {
VarHandleMap var_handle_map;
return Equals(var, val, &var_handle_map);
}
@@ -177,7 +177,7 @@ class V8VarConverterTest : public testing::Test {
void SetUp() override {
ProxyLock::Acquire();
v8::HandleScope handle_scope(isolate_);
- v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate_);
+ v8::Local<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate_);
context_.Reset(isolate_, v8::Context::New(isolate_, NULL, global));
}
void TearDown() override {
@@ -187,8 +187,8 @@ class V8VarConverterTest : public testing::Test {
}
protected:
- bool FromV8ValueSync(v8::Handle<v8::Value> val,
- v8::Handle<v8::Context> context,
+ bool FromV8ValueSync(v8::Local<v8::Value> val,
+ v8::Local<v8::Context> context,
PP_Var* result) {
V8VarConverter::VarResult conversion_result =
converter_->FromV8Value(val,
@@ -206,7 +206,7 @@ class V8VarConverterTest : public testing::Test {
v8::Local<v8::Context> context =
v8::Local<v8::Context>::New(isolate_, context_);
v8::Context::Scope context_scope(context);
- v8::Handle<v8::Value> v8_result;
+ v8::Local<v8::Value> v8_result;
if (!converter_->ToV8Value(var, context, &v8_result))
return false;
if (!Equals(var, v8_result))
@@ -344,7 +344,7 @@ TEST_F(V8VarConverterTest, Cycles) {
dictionary->SetWithStringKey("1", release_array.get());
array->Set(0, release_dictionary.get());
- v8::Handle<v8::Value> v8_result;
+ v8::Local<v8::Value> v8_result;
// Array <-> dictionary cycle.
dictionary->SetWithStringKey("1", release_array.get());
@@ -365,8 +365,8 @@ TEST_F(V8VarConverterTest, Cycles) {
// V8->Var conversion.
{
- v8::Handle<v8::Object> object = v8::Object::New(isolate_);
- v8::Handle<v8::Array> array = v8::Array::New(isolate_);
+ v8::Local<v8::Object> object = v8::Object::New(isolate_);
+ v8::Local<v8::Array> array = v8::Array::New(isolate_);
PP_Var var_result;
@@ -414,9 +414,9 @@ TEST_F(V8VarConverterTest, StrangeDictionaryKeyTest) {
"};"
"})();";
- v8::Handle<v8::Script> script(
+ v8::Local<v8::Script> script(
v8::Script::Compile(v8::String::NewFromUtf8(isolate_, source)));
- v8::Handle<v8::Object> object = script->Run().As<v8::Object>();
+ v8::Local<v8::Object> object = script->Run().As<v8::Object>();
ASSERT_FALSE(object.IsEmpty());
PP_Var actual;
« no previous file with comments | « content/renderer/pepper/v8_var_converter.cc ('k') | content/renderer/pepper/v8object_var.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698