PPAPI: Make V8VarConverter longer-lived

content/renderer/pepper/ppb_var_deprecated_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/ppb_var_deprecated_impl.h"
 
 #include <limits>
 
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/message_channel.h"
@@ skipping 24 matching lines @@
 
 const char kInvalidIdentifierException[] = "Error: Invalid identifier.";
 const char kInvalidObjectException[] = "Error: Invalid object";
 const char kUnableToCallMethodException[] = "Error: Unable to call method";
 
 class ObjectAccessor {
  public:
   ObjectAccessor(PP_Var var)
       : object_var_(V8ObjectVar::FromPPVar(var).get()),
         instance_(object_var_ ? object_var_->instance() : NULL) {
+    if (instance_) {
+      converter_.reset(new V8VarConverter(instance_->pp_instance(),
+                                          V8VarConverter::kAllowObjectVars));
+    }
   }
 
   // Check if the object is valid. If it isn't, set an exception and return
   // false.
   bool IsValid(PP_Var* exception) {
     // If we already have an exception, then the call is invalid according to
     // the unittests.
     if (exception && exception->type != PP_VARTYPE_UNDEFINED)
       return false;
     if (instance_)
       return true;
     if (exception)
       *exception = ppapi::StringVar::StringToPPVar(kInvalidObjectException);
     return false;
   }
   // Lazily grab the object so that the handle is created in the current handle
   // scope.
   v8::Handle<v8::Object> GetObject() { return object_var_->GetHandle(); }
   PepperPluginInstanceImpl* instance() { return instance_; }
+  V8VarConverter* converter() { return converter_.get(); }
 
  private:
   V8ObjectVar* object_var_;
   PepperPluginInstanceImpl* instance_;
+  scoped_ptr<V8VarConverter> converter_;
 };
 
 bool IsValidIdentifer(PP_Var identifier, PP_Var* exception) {
   if (identifier.type == PP_VARTYPE_INT32 ||
       identifier.type == PP_VARTYPE_STRING) {
     return true;
   }
   if (exception)
     *exception = ppapi::StringVar::StringToPPVar(kInvalidIdentifierException);
   return false;
 }
 
 bool HasPropertyDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception) || !IsValidIdentifer(name, exception))
     return false;
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
   v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
   if (try_catch.HasException())
     return false;
 
   bool result = accessor.GetObject()->Has(v8_name);
   if (try_catch.HasException())
     return false;
   return result;
 }
 
 bool HasMethodDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception) || !IsValidIdentifer(name, exception))
     return false;
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
   v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
   if (try_catch.HasException())
     return false;
 
   bool result = accessor.GetObject()->Has(v8_name) &&
       accessor.GetObject()->Get(v8_name)->IsFunction();
   if (try_catch.HasException())
     return false;
   return result;
 }
 
 PP_Var GetProperty(PP_Var var, PP_Var name, PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception) || !IsValidIdentifer(name, exception))
     return PP_MakeUndefined();
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
   v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
   if (try_catch.HasException())
     return PP_MakeUndefined();
 
   ScopedPPVar result_var = try_catch.FromV8(accessor.GetObject()->Get(v8_name));
   if (try_catch.HasException())
     return PP_MakeUndefined();
 
   return result_var.Release();
 }
 
 void EnumerateProperties(PP_Var var,
                          uint32_t* property_count,
                          PP_Var** properties,
                          PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception))
     return;
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
 
   *properties = NULL;
   *property_count = 0;
 
   v8::Local<v8::Array> identifiers = accessor.GetObject()->GetPropertyNames();
   if (try_catch.HasException())
     return;
   ScopedPPVarArray identifier_vars(identifiers->Length());
   for (uint32_t i = 0; i < identifiers->Length(); ++i) {
     ScopedPPVar var = try_catch.FromV8(identifiers->Get(i));
     if (try_catch.HasException())
       return;
     identifier_vars.Set(i, var);
   }
 
   size_t size = identifier_vars.size();
   *properties = identifier_vars.Release(
       ScopedPPVarArray::PassPPBMemoryAllocatedArray());
   *property_count = size;
 }
 
 void SetPropertyDeprecated(PP_Var var,
                            PP_Var name,
                            PP_Var value,
                            PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception) || !IsValidIdentifer(name, exception))
     return;
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  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);
 
   if (try_catch.HasException())
     return;
 
   accessor.GetObject()->Set(v8_name, v8_value);
   try_catch.HasException();  // Ensure an exception gets set if one occured.
 }
 
 void DeletePropertyDeprecated(PP_Var var, PP_Var name, PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception) || !IsValidIdentifer(name, exception))
     return;
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
   v8::Handle<v8::Value> v8_name = try_catch.ToV8(name);
 
   if (try_catch.HasException())
     return;
 
   accessor.GetObject()->Delete(v8_name);
   try_catch.HasException();  // Ensure an exception gets set if one occured.
 }
 
 PP_Var CallDeprecatedInternal(PP_Var var,
                               PP_Var method_name,
                               uint32_t argc,
                               PP_Var* argv,
                               PP_Var* exception) {
   ObjectAccessor accessor(var);
   if (!accessor.IsValid(exception))
     return PP_MakeUndefined();
 
   // If the method name is undefined, set it to the empty string to trigger
   // calling |var| as a function.
   ScopedPPVar scoped_name(method_name);
   if (method_name.type == PP_VARTYPE_UNDEFINED) {
     scoped_name = ScopedPPVar(ScopedPPVar::PassRef(),
                                 StringVar::StringToPPVar(""));
   }
 
-  PepperTryCatchVar try_catch(accessor.instance(), exception);
+  PepperTryCatchVar try_catch(accessor.instance(), accessor.converter(),
+                              exception);
   v8::Handle<v8::Value> v8_method_name = try_catch.ToV8(scoped_name.get());
   if (try_catch.HasException())
     return PP_MakeUndefined();
 
   if (!v8_method_name->IsString()) {
     try_catch.SetException(kUnableToCallMethodException);
     return PP_MakeUndefined();
   }
 
   v8::Handle<v8::Object> function = accessor.GetObject();
@@ skipping 120 matching lines @@
       &CallDeprecated,
       &Construct,
       &IsInstanceOfDeprecated,
       &CreateObjectDeprecated,
       &CreateObjectWithModuleDeprecated, };
 
   return &var_deprecated_interface;
 }
 
 }  // namespace content