summaryrefslogtreecommitdiffstats
path: root/content/renderer/pepper/pepper_try_catch.h
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2014-08-27 21:51:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-28 04:52:44 +0000
commit93b2c74d78b7b9d9bcb8d45e7987e93a349772e7 (patch)
tree7f914402113a18cde96515f69a1c7591861235a6 /content/renderer/pepper/pepper_try_catch.h
parenta7b4a883cc904ecda130e0a8d91204f3770f2fae (diff)
downloadchromium_src-93b2c74d78b7b9d9bcb8d45e7987e93a349772e7.zip
chromium_src-93b2c74d78b7b9d9bcb8d45e7987e93a349772e7.tar.gz
chromium_src-93b2c74d78b7b9d9bcb8d45e7987e93a349772e7.tar.bz2
Revert of Replace NPObject usage in ppapi with gin (patchset #26 of https://codereview.chromium.org/459553003/)
Reason for revert: Crash in telemetry tests http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_swarming/builds/6615 Original issue's description: > Replace NPObject usage in ppapi with gin > > This replaces usage of NPObject in pepper with gin-backed V8 objects. It is unfortunate that this CL is so large, but there isn't a nice way to have the old implementation and the new one side-by-side. > > There are 4 major parts to this CL: > 1) Changing the HostVarTracker to track V8ObjectVars rather than NPObjectVars (host_var_tracker.cc). > 2) Changing plugin elements (in plugin_object.cc) to be gin-backed objects. > 3) Changing postMessage bindings (message_channel.cc) be gin-backed objects. > 4) Changing the implementation of PPB_Var_Deprecated (ppb_var_deprecated_impl.cc) to call directly into V8. > > > BUG=351636 > > Committed: https://chromium.googlesource.com/chromium/src/+/21f446ae855d60cc896b40cb9a3249ed07f150b3 TBR=jochen@chromium.org,dmichael@chromium.org,kolczyk@opera.com NOTREECHECKS=true NOTRY=true BUG=351636 Review URL: https://codereview.chromium.org/512983004 Cr-Commit-Position: refs/heads/master@{#292322}
Diffstat (limited to 'content/renderer/pepper/pepper_try_catch.h')
-rw-r--r--content/renderer/pepper/pepper_try_catch.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h
index b957df0..6b76717 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 PepperPluginInstanceImpl;
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 @@ class CONTENT_EXPORT PepperTryCatch {
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 @@ 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();