summaryrefslogtreecommitdiffstats
path: root/content/renderer/pepper/pepper_try_catch.h
diff options
context:
space:
mode:
authorraymes <raymes@chromium.org>2014-08-24 20:00:03 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-25 03:01:07 +0000
commit41480ebd0095ac41c5b5f4e2fdbadedd8f69e041 (patch)
tree47b493ffad1f4b1c829208b7b44008977d10deee /content/renderer/pepper/pepper_try_catch.h
parent1cc19e420c43d6ec628a0b62bdcc86625d366a65 (diff)
downloadchromium_src-41480ebd0095ac41c5b5f4e2fdbadedd8f69e041.zip
chromium_src-41480ebd0095ac41c5b5f4e2fdbadedd8f69e041.tar.gz
chromium_src-41480ebd0095ac41c5b5f4e2fdbadedd8f69e041.tar.bz2
Minor changes to allow Pepper InstancePrivate tests to pass with gin
This includes some minor changes which allow tests to when NPObject is replaced by gin in pepper: -Add shared library exports for use of PepperTryCatch and ScopedPPVarArray in tests. -Add gin as a dependency to content_unittests for use in host_var_tracker_unittest -Change TestInstanceDeprecated so that it doesn't execute a script from the ScriptableObject upon destruction. The reason for this is that the garbage collector is manually run from the destructor of the plugin Instance object. This results in destruction of the ScriptableObject and then javascript is re-entered via ExecuteScript. This should never happen outside tests because the garbage collector won't be run synchronously. Instead of running ExecuteScript, which just set a variable in the Instance object to verify that the ScriptableObject was correctly destroyed. BUG=351636 Review URL: https://codereview.chromium.org/472693002 Cr-Commit-Position: refs/heads/master@{#291636}
Diffstat (limited to 'content/renderer/pepper/pepper_try_catch.h')
-rw-r--r--content/renderer/pepper/pepper_try_catch.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/pepper/pepper_try_catch.h b/content/renderer/pepper/pepper_try_catch.h
index f82c0c3..6b76717 100644
--- a/content/renderer/pepper/pepper_try_catch.h
+++ b/content/renderer/pepper/pepper_try_catch.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_PEPPER_PEPPER_TRY_CATCH_H_
#include "base/basictypes.h"
+#include "content/common/content_export.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/shared_impl/scoped_pp_var.h"
#include "v8/include/v8.h"
@@ -15,7 +16,7 @@ namespace content {
class PepperPluginInstanceImpl;
// Base class for scripting TryCatch helpers.
-class PepperTryCatch {
+class CONTENT_EXPORT PepperTryCatch {
public:
PepperTryCatch(PepperPluginInstanceImpl* instance,
bool convert_objects);