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

ppapi/shared_impl/var_tracker.cc

Index: ppapi/shared_impl/var_tracker.cc
diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc
index a564fede019a7003d467035d750735646d82107f..7ca184d54fdadc49f0cc9c2bad0ca35e4291af28 100644
--- a/ppapi/shared_impl/var_tracker.cc
+++ b/ppapi/shared_impl/var_tracker.cc
@@ -12,6 +12,12 @@
 #include "ppapi/shared_impl/id_assignment.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().

+#endif
+
 namespace ppapi {
 
 VarTracker::VarInfo::VarInfo()
@@ -33,13 +39,13 @@ VarTracker::~VarTracker() {
 }
 
 int32 VarTracker::AddVar(Var* var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   return AddVarInternal(var, ADD_VAR_TAKE_ONE_REFERENCE);
 }
 
 Var* VarTracker::GetVar(int32 var_id) const {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   VarMap::const_iterator result = live_vars_.find(var_id);
   if (result == live_vars_.end())
@@ -48,7 +54,7 @@ Var* VarTracker::GetVar(int32 var_id) const {
 }
 
 Var* VarTracker::GetVar(const PP_Var& var) const {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   if (!IsVarTypeRefcounted(var.type))
     return NULL;
@@ -56,7 +62,7 @@ Var* VarTracker::GetVar(const PP_Var& var) const {
 }
 
 bool VarTracker::AddRefVar(int32 var_id) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
       << var_id << " is not a PP_Var ID.";
@@ -81,7 +87,7 @@ bool VarTracker::AddRefVar(int32 var_id) {
 }
 
 bool VarTracker::AddRefVar(const PP_Var& var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   if (!IsVarTypeRefcounted(var.type))
     return false;
@@ -89,7 +95,7 @@ bool VarTracker::AddRefVar(const PP_Var& var) {
 }
 
 bool VarTracker::ReleaseVar(int32 var_id) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
       << var_id << " is not a PP_Var ID.";
@@ -122,7 +128,7 @@ bool VarTracker::ReleaseVar(int32 var_id) {
 }
 
 bool VarTracker::ReleaseVar(const PP_Var& var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   if (!IsVarTypeRefcounted(var.type))
     return false;
@@ -146,7 +152,7 @@ VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32 id) {
 }
 
 int VarTracker::GetRefCountForObject(const PP_Var& plugin_object) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   VarMap::iterator found = GetLiveVar(plugin_object);
   if (found == live_vars_.end())
@@ -156,7 +162,7 @@ int VarTracker::GetRefCountForObject(const PP_Var& plugin_object) {
 
 int VarTracker::GetTrackedWithNoReferenceCountForObject(
     const PP_Var& plugin_object) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   VarMap::iterator found = GetLiveVar(plugin_object);
   if (found == live_vars_.end())
@@ -178,7 +184,7 @@ bool VarTracker::IsVarTypeRefcounted(PP_VarType type) const {
 }
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
@@ -188,7 +194,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
                                         const void* data) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
@@ -198,7 +204,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
 }
 
 std::vector<PP_Var> VarTracker::GetLiveVars() {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   std::vector<PP_Var> var_vector;
   var_vector.reserve(live_vars_.size());