| Index: content/renderer/pepper/ppb_var_deprecated_impl.cc
|
| diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc
|
| index 589981cfb9c4ca82d7b31a32e0d9c4a03407730f..4188ee6e3d4d4214c101cc4f414f172e6bc8e8f7 100644
|
| --- a/content/renderer/pepper/ppb_var_deprecated_impl.cc
|
| +++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc
|
| @@ -63,7 +63,7 @@ class ObjectAccessor {
|
| }
|
| // Lazily grab the object so that the handle is created in the current handle
|
| // scope.
|
| - v8::Handle<v8::Object> GetObject() { return object_var_->GetHandle(); }
|
| + v8::Local<v8::Object> GetObject() { return object_var_->GetHandle(); }
|
| PepperPluginInstanceImpl* instance() { return instance_; }
|
| V8VarConverter* converter() { return converter_.get(); }
|
|
|
| @@ -90,7 +90,7 @@ bool HasPropertyDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
|
| + v8::Local<v8::Value> v8_name = try_catch.ToV8(name);
|
| if (try_catch.HasException())
|
| return false;
|
|
|
| @@ -107,7 +107,7 @@ bool HasMethodDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
|
| + v8::Local<v8::Value> v8_name = try_catch.ToV8(name);
|
| if (try_catch.HasException())
|
| return false;
|
|
|
| @@ -125,7 +125,7 @@ PP_Var GetProperty(PP_Var var, PP_Var name, PP_Var* exception) {
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
|
| + v8::Local<v8::Value> v8_name = try_catch.ToV8(name);
|
| if (try_catch.HasException())
|
| return PP_MakeUndefined();
|
|
|
| @@ -177,8 +177,8 @@ void SetPropertyDeprecated(PP_Var var,
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
|
| - v8::Handle<v8::Value> v8_value = try_catch.ToV8(value);
|
| + v8::Local<v8::Value> v8_name = try_catch.ToV8(name);
|
| + v8::Local<v8::Value> v8_value = try_catch.ToV8(value);
|
|
|
| if (try_catch.HasException())
|
| return;
|
| @@ -194,7 +194,7 @@ void DeletePropertyDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
|
| + v8::Local<v8::Value> v8_name = try_catch.ToV8(name);
|
|
|
| if (try_catch.HasException())
|
| return;
|
| @@ -222,7 +222,7 @@ PP_Var CallDeprecatedInternal(PP_Var var,
|
|
|
| PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
|
| exception);
|
| - v8::Handle<v8::Value> v8_method_name = try_catch.ToV8(scoped_name.get());
|
| + v8::Local<v8::Value> v8_method_name = try_catch.ToV8(scoped_name.get());
|
| if (try_catch.HasException())
|
| return PP_MakeUndefined();
|
|
|
| @@ -231,8 +231,8 @@ PP_Var CallDeprecatedInternal(PP_Var var,
|
| return PP_MakeUndefined();
|
| }
|
|
|
| - v8::Handle<v8::Object> function = accessor.GetObject();
|
| - v8::Handle<v8::Object> recv =
|
| + v8::Local<v8::Object> function = accessor.GetObject();
|
| + v8::Local<v8::Object> recv =
|
| accessor.instance()->GetMainWorldContext()->Global();
|
| if (v8_method_name.As<v8::String>()->Length() != 0) {
|
| function = function->Get(v8_method_name)
|
| @@ -248,8 +248,8 @@ PP_Var CallDeprecatedInternal(PP_Var var,
|
| return PP_MakeUndefined();
|
| }
|
|
|
| - scoped_ptr<v8::Handle<v8::Value>[] > converted_args(
|
| - new v8::Handle<v8::Value>[argc]);
|
| + scoped_ptr<v8::Local<v8::Value>[] > converted_args(
|
| + new v8::Local<v8::Value>[argc]);
|
| for (uint32_t i = 0; i < argc; ++i) {
|
| converted_args[i] = try_catch.ToV8(argv[i]);
|
| if (try_catch.HasException())
|
| @@ -266,7 +266,7 @@ PP_Var CallDeprecatedInternal(PP_Var var,
|
| return PP_MakeUndefined();
|
| }
|
|
|
| - v8::Handle<v8::Value> result = frame->callFunctionEvenIfScriptDisabled(
|
| + v8::Local<v8::Value> result = frame->callFunctionEvenIfScriptDisabled(
|
| function.As<v8::Function>(), recv, argc, converted_args.get());
|
| ScopedPPVar result_var = try_catch.FromV8(result);
|
|
|
| @@ -304,7 +304,7 @@ bool IsInstanceOfDeprecated(PP_Var var,
|
| return false; // Not an object at all.
|
|
|
| v8::HandleScope handle_scope(object->instance()->GetIsolate());
|
| - v8::Handle<v8::Context> context = object->instance()->GetMainWorldContext();
|
| + v8::Local<v8::Context> context = object->instance()->GetMainWorldContext();
|
| if (context.IsEmpty())
|
| return false;
|
| v8::Context::Scope context_scope(context);
|
|
|