Index: content/renderer/pepper/pepper_try_catch.h |
diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h |
index b957df035403bc5417d8e86f34af6b3b5d95caa4..6b767175e2a3bc88d558d505f6b310e308239afa 100644 |
--- a/content/renderer/pepper/pepper_try_catch.h |
+++ b/content/renderer/pepper/pepper_try_catch.h |
@@ -7,7 +7,6 @@ |
#include "base/basictypes.h" |
#include "content/common/content_export.h" |
-#include "content/renderer/pepper/v8_var_converter.h" |
#include "ppapi/c/pp_var.h" |
#include "ppapi/shared_impl/scoped_pp_var.h" |
#include "v8/include/v8.h" |
@@ -20,7 +19,7 @@ |
class CONTENT_EXPORT PepperTryCatch { |
public: |
PepperTryCatch(PepperPluginInstanceImpl* instance, |
- V8VarConverter::AllowObjectVars convert_objects); |
+ bool convert_objects); |
virtual ~PepperTryCatch(); |
virtual void SetException(const char* message) = 0; |
@@ -35,17 +34,16 @@ |
protected: |
PepperPluginInstanceImpl* instance_; |
- // Whether To/FromV8 should convert object vars. If set to |
- // kDisallowObjectVars, an exception should be set if they are encountered |
- // during conversion. |
- V8VarConverter::AllowObjectVars convert_objects_; |
+ // Whether To/FromV8 should convert object vars. If set to false, an exception |
+ // should be set if they are encountered during conversion. |
+ bool convert_objects_; |
}; |
// Catches var exceptions and emits a v8 exception. |
class PepperTryCatchV8 : public PepperTryCatch { |
public: |
PepperTryCatchV8(PepperPluginInstanceImpl* instance, |
- V8VarConverter::AllowObjectVars convert_objects, |
+ bool convert_objects, |
v8::Isolate* isolate); |
virtual ~PepperTryCatchV8(); |
@@ -70,6 +68,7 @@ |
// is responsible for managing the lifetime of the exception. It is valid to |
// pass NULL for |exception| in which case no exception will be set. |
PepperTryCatchVar(PepperPluginInstanceImpl* instance, |
+ bool convert_objects, |
PP_Var* exception); |
virtual ~PepperTryCatchVar(); |