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

webkit/plugins/ppapi/host_var_tracker.cc

Index: webkit/plugins/ppapi/host_var_tracker.cc
diff --git a/webkit/plugins/ppapi/host_var_tracker.cc b/webkit/plugins/ppapi/host_var_tracker.cc
index 97db0fc8a81f0320d80202138b58e2853c0f4d07..a9076db5e64ebdc331a91d61cedb33e89a7e559a 100644
--- a/webkit/plugins/ppapi/host_var_tracker.cc
+++ b/webkit/plugins/ppapi/host_var_tracker.cc
@@ -13,6 +13,12 @@
 using ppapi::ArrayBufferVar;
 using ppapi::NPObjectVar;
 
+#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 webkit {
 namespace ppapi {
 
@@ -27,7 +33,7 @@ ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32 size_in_bytes) {
 }
 
 void HostVarTracker::AddNPObjectVar(NPObjectVar* object_var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   InstanceMap::iterator found_instance = instance_map_.find(
       object_var->pp_instance());
@@ -48,7 +54,7 @@ void HostVarTracker::AddNPObjectVar(NPObjectVar* object_var) {
 }
 
 void HostVarTracker::RemoveNPObjectVar(NPObjectVar* object_var) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   InstanceMap::iterator found_instance = instance_map_.find(
       object_var->pp_instance());
@@ -77,7 +83,7 @@ void HostVarTracker::RemoveNPObjectVar(NPObjectVar* object_var) {
 
 NPObjectVar* HostVarTracker::NPObjectVarForNPObject(PP_Instance instance,
                                                     NPObject* np_object) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   InstanceMap::iterator found_instance = instance_map_.find(instance);
   if (found_instance == instance_map_.end())
@@ -92,7 +98,7 @@ NPObjectVar* HostVarTracker::NPObjectVarForNPObject(PP_Instance instance,
 }
 
 int HostVarTracker::GetLiveNPObjectVarsForInstance(PP_Instance instance) const {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   InstanceMap::const_iterator found = instance_map_.find(instance);
   if (found == instance_map_.end())
@@ -101,7 +107,7 @@ int HostVarTracker::GetLiveNPObjectVarsForInstance(PP_Instance instance) const {
 }
 
 void HostVarTracker::ForceFreeNPObjectsForInstance(PP_Instance instance) {
-  DCHECK(CalledOnValidThread());
+  CHECK_VALID_THREAD();
 
   InstanceMap::iterator found_instance = instance_map_.find(instance);
   if (found_instance == instance_map_.end())