PPAPI: Compile out thread checks when pepper threading is turned on.

ppapi/proxy/plugin_var_tracker.cc

Index: ppapi/proxy/plugin_var_tracker.cc
diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc
index 74cd55795e7211d0788e1a2211b72e0089b3dd86..3669c235ff11c5d183ab3c9a2578f82043c6f76a 100644
--- a/ppapi/proxy/plugin_var_tracker.cc
+++ b/ppapi/proxy/plugin_var_tracker.cc
@@ -14,6 +14,12 @@
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/var.h"
 
+#ifdef ENABLE_PEPPER_THREADING
+#define CHECK_VALID_THREAD() do {} while(false)
+#else
+#define CHECK_VALID_THREAD() do { CalledOnValidThread(); } while(false)

[yzshen1, 2012/04/12 22:21:23]

- We need to DCHECK the result of CalledOnValidThread().

- [optional] The other way is to derive the var tracker from
NonThreadSafeDoNothing if ENABLE_PEPPER_THREADING. And then
DCHECK(CalledOnValidThread()) can be used for both cases. It seems better to me
because we don't have to duplicate the definition of CHECK_VALID_THREAD in three
files.

+#endif
+
 namespace ppapi {
 namespace proxy {
 
@@ -38,7 +44,7 @@ PluginVarTracker::~PluginVarTracker() {
 
 PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var,
                                               PluginDispatcher* dispatcher) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
   DCHECK(host_var.type == PP_VARTYPE_OBJECT);
 
   // Get the object.
@@ -64,7 +70,7 @@ PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var,
 PP_Var PluginVarTracker::TrackObjectWithNoReference(
     const PP_Var& host_var,
     PluginDispatcher* dispatcher) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
   DCHECK(host_var.type == PP_VARTYPE_OBJECT);
 
   // Get the object.
@@ -82,7 +88,7 @@ PP_Var PluginVarTracker::TrackObjectWithNoReference(
 
 void PluginVarTracker::StopTrackingObjectWithNoReference(
     const PP_Var& plugin_var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
   DCHECK(plugin_var.type == PP_VARTYPE_OBJECT);
 
   VarMap::iterator found = GetLiveVar(plugin_var);
@@ -97,7 +103,7 @@ void PluginVarTracker::StopTrackingObjectWithNoReference(
 }
 
 PP_Var PluginVarTracker::GetHostObject(const PP_Var& plugin_object) const {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   if (plugin_object.type != PP_VARTYPE_OBJECT) {
     NOTREACHED();
@@ -119,7 +125,7 @@ PP_Var PluginVarTracker::GetHostObject(const PP_Var& plugin_object) const {
 
 PluginDispatcher* PluginVarTracker::DispatcherForPluginObject(
     const PP_Var& plugin_object) const {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   if (plugin_object.type != PP_VARTYPE_OBJECT)
     return NULL;
@@ -136,7 +142,7 @@ PluginDispatcher* PluginVarTracker::DispatcherForPluginObject(
 
 void PluginVarTracker::ReleaseHostObject(PluginDispatcher* dispatcher,
                                          const PP_Var& host_object) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
   DCHECK(host_object.type == PP_VARTYPE_OBJECT);
 
   // Convert the host object to a normal var valid in the plugin.