PPAPI: Make V8VarConverter longer-lived

content/renderer/pepper/pepper_try_catch.cc

 // Copyright 2014 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/pepper_try_catch.h"
 
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
+#include "content/renderer/pepper/v8_var_converter.h"
 #include "gin/converter.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"
 
 namespace content {
 
 namespace {
 
 const char kConversionException[] =
     "Error: Failed conversion between PP_Var and V8 value";
 const char kInvalidException[] = "Error: An invalid exception was thrown.";
 
 }  // namespace
 
 PepperTryCatch::PepperTryCatch(PepperPluginInstanceImpl* instance,
-                               V8VarConverter::AllowObjectVars convert_objects)
-    : instance_(instance),
-      convert_objects_(convert_objects) {}
+                               V8VarConverter* var_converter)
+    : instance_(instance), var_converter_(var_converter) {}

[raymes, 2014/10/09 22:04:42]

nit, optional: since we know that the conversion mode should always be
V8VarConverter::AllowObjectVars here, maybe we could DCHECK it?

[dmichael (off chromium), 2014/10/09 22:45:37]

You mean kAllowObjectVars? We don't know that here...  MessageChannel passes
kDisallowObjectVars to PepperTryCatchV8, which ends up here.

We could in theory DCHECK in PepperTryCatchVar (maybe that's what you meant?).
But I think that's only because we don't happen to use Disallow for
PepperTryCatchVar. But I don't think there's any reason we couldn't do that if
we wanted to.

[raymes, 2014/10/10 19:27:14]

Sorry, yeah that's what I meant :)
Ok, sounds good.

 
 PepperTryCatch::~PepperTryCatch() {}
 
 v8::Handle<v8::Value> PepperTryCatch::ToV8(PP_Var var) {
   if (HasException()) {
     SetException(kConversionException);
     return v8::Handle<v8::Value>();
   }
 
-  V8VarConverter converter(instance_->pp_instance(), convert_objects_);
   v8::Handle<v8::Value> result;
-  bool success = converter.ToV8Value(var, GetContext(), &result);
+  bool success = var_converter_->ToV8Value(var, GetContext(), &result);
   if (!success) {
     SetException(kConversionException);
     return v8::Handle<v8::Value>();
   }
   return result;
 }
 
 ppapi::ScopedPPVar PepperTryCatch::FromV8(v8::Handle<v8::Value> v8_value) {
   if (HasException() || v8_value.IsEmpty()) {
     SetException(kConversionException);
     return ppapi::ScopedPPVar();
   }
   ppapi::ScopedPPVar result;
-  V8VarConverter converter(instance_->pp_instance(), convert_objects_);
-  bool success = converter.FromV8ValueSync(v8_value, GetContext(), &result);
+  bool success =
+      var_converter_->FromV8ValueSync(v8_value, GetContext(), &result);
   if (!success) {
     SetException(kConversionException);
     return ppapi::ScopedPPVar();
   }
   return result;
 }
 
-PepperTryCatchV8::PepperTryCatchV8(
-    PepperPluginInstanceImpl* instance,
-    V8VarConverter::AllowObjectVars convert_objects,
-    v8::Isolate* isolate)
-    : PepperTryCatch(instance, convert_objects),
+PepperTryCatchV8::PepperTryCatchV8(PepperPluginInstanceImpl* instance,
+                                   V8VarConverter* var_converter,
+                                   v8::Isolate* isolate)
+    : PepperTryCatch(instance, var_converter),
       exception_(PP_MakeUndefined()) {
   // Typically when using PepperTryCatchV8 we are passed an isolate. We verify
   // that this isolate is the same as the plugin isolate.
   DCHECK(isolate == instance_->GetIsolate());
 
   // We assume that a handle scope and context has been setup by the user of
   // this class. This is typically true because this class is used when calling
   // into the plugin from JavaScript. We want to use whatever v8 context the
   // caller is in.
 }
@@ skipping 38 matching lines @@
 }
 
 void PepperTryCatchV8::SetException(const char* message) {
   if (HasException())
     return;
 
   exception_ = ppapi::StringVar::StringToPPVar(message);
 }
 
 PepperTryCatchVar::PepperTryCatchVar(PepperPluginInstanceImpl* instance,
+                                     V8VarConverter* var_converter,
                                      PP_Var* exception)
-    : PepperTryCatch(instance, V8VarConverter::kAllowObjectVars),
+    : PepperTryCatch(instance, var_converter),
       handle_scope_(instance_->GetIsolate()),
       context_(GetContext()),
       exception_(exception),
       exception_is_set_(false) {
   // We switch to the plugin context if it's not empty.
   if (!context_.IsEmpty())
     context_->Enter();
 }
 
 PepperTryCatchVar::~PepperTryCatchVar() {
@@ skipping 30 matching lines @@
 void PepperTryCatchVar::SetException(const char* message) {
   if (exception_is_set_)
     return;
 
   if (exception_)
     *exception_ = ppapi::StringVar::StringToPPVar(message, strlen(message));
   exception_is_set_ = true;
 }
 
 }  // namespace content