Index: content/renderer/pepper/v8_var_converter.cc |
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc |
index f36f8cf5759e3b447e1c06274ebd48ad598ec1a9..5fdd87f3e2e97ec5d9082940b61f069c348d1c07 100644 |
--- a/content/renderer/pepper/v8_var_converter.cc |
+++ b/content/renderer/pepper/v8_var_converter.cc |
@@ -83,7 +83,7 @@ |
// value was created as a result of calling the function. |
bool GetOrCreateV8Value(v8::Handle<v8::Context> context, |
const PP_Var& var, |
- V8VarConverter::AllowObjectVars object_vars_allowed, |
+ bool object_vars_allowed, |
v8::Handle<v8::Value>* result, |
bool* did_create, |
VarHandleMap* visited_ids, |
@@ -155,7 +155,7 @@ |
*result = v8::Object::New(isolate); |
break; |
case PP_VARTYPE_OBJECT: { |
- DCHECK(object_vars_allowed == V8VarConverter::kAllowObjectVars); |
+ DCHECK(object_vars_allowed); |
scoped_refptr<V8ObjectVar> v8_object_var = V8ObjectVar::FromPPVar(var); |
if (!v8_object_var.get()) { |
NOTREACHED(); |
@@ -187,7 +187,7 @@ |
bool GetOrCreateVar(v8::Handle<v8::Value> val, |
v8::Handle<v8::Context> context, |
PP_Instance instance, |
- V8VarConverter::AllowObjectVars object_vars_allowed, |
+ bool object_vars_allowed, |
PP_Var* result, |
bool* did_create, |
HandleVarMap* visited_handles, |
@@ -234,7 +234,7 @@ |
scoped_refptr<HostArrayBufferVar> buffer_var( |
new HostArrayBufferVar(*web_array_buffer)); |
*result = buffer_var->GetPPVar(); |
- } else if (object_vars_allowed == V8VarConverter::kAllowObjectVars) { |
+ } else if (object_vars_allowed) { |
v8::Handle<v8::Object> object = val->ToObject(); |
*result = content::HostGlobals::Get()-> |
host_var_tracker()->V8ObjectVarForV8Object(instance, object); |
@@ -271,14 +271,13 @@ |
V8VarConverter::V8VarConverter(PP_Instance instance) |
: instance_(instance), |
- object_vars_allowed_(kDisallowObjectVars), |
+ object_vars_allowed_(false), |
message_loop_proxy_(base::MessageLoopProxy::current()) { |
resource_converter_.reset(new ResourceConverterImpl( |
instance, RendererPpapiHost::GetForPPInstance(instance))); |
} |
-V8VarConverter::V8VarConverter(PP_Instance instance, |
- AllowObjectVars object_vars_allowed) |
+V8VarConverter::V8VarConverter(PP_Instance instance, bool object_vars_allowed) |
: instance_(instance), |
object_vars_allowed_(object_vars_allowed), |
message_loop_proxy_(base::MessageLoopProxy::current()) { |
@@ -289,7 +288,7 @@ |
V8VarConverter::V8VarConverter(PP_Instance instance, |
scoped_ptr<ResourceConverter> resource_converter) |
: instance_(instance), |
- object_vars_allowed_(kDisallowObjectVars), |
+ object_vars_allowed_(false), |
message_loop_proxy_(base::MessageLoopProxy::current()), |
resource_converter_(resource_converter.release()) {} |