Chromium Code Reviews| 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 f82c0c31080ca2b14710458e0c458da9982ab930..8b4effa73496e0d9142fd137cdc3eb3e7cdac62f 100644 |
| --- a/content/renderer/pepper/pepper_try_catch.h |
| +++ b/content/renderer/pepper/pepper_try_catch.h |
| @@ -6,6 +6,8 @@ |
| #define CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_ |
| #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" |
| @@ -15,10 +17,10 @@ namespace content { |
| class PepperPluginInstanceImpl; |
| // Base class for scripting TryCatch helpers. |
| -class PepperTryCatch { |
| +class CONTENT_EXPORT PepperTryCatch { |
| public: |
| PepperTryCatch(PepperPluginInstanceImpl* instance, |
| - bool convert_objects); |
| + V8VarConverter::AllowObjectVars convert_objects); |
| virtual ~PepperTryCatch(); |
| virtual void SetException(const char* message) = 0; |
| @@ -35,14 +37,14 @@ class PepperTryCatch { |
| // Whether To/FromV8 should convert object vars. If set to false, an exception |
|
dmichael (off chromium)
2014/08/22 16:28:47
nit: comment is out of date
raymes
2014/08/25 01:40:01
Done.
|
| // should be set if they are encountered during conversion. |
| - bool convert_objects_; |
| + V8VarConverter::AllowObjectVars convert_objects_; |
| }; |
| // Catches var exceptions and emits a v8 exception. |
| class PepperTryCatchV8 : public PepperTryCatch { |
| public: |
| PepperTryCatchV8(PepperPluginInstanceImpl* instance, |
| - bool convert_objects, |
| + V8VarConverter::AllowObjectVars convert_objects, |
| v8::Isolate* isolate); |
| virtual ~PepperTryCatchV8(); |
| @@ -67,7 +69,6 @@ class PepperTryCatchVar : public PepperTryCatch { |
| // 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(); |