Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Unified Diff: content/renderer/pepper/pepper_try_catch.h

Issue 512983004: Revert of Replace NPObject usage in ppapi with gin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/pepper_try_catch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/pepper_try_catch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698