commit 41e52fb588e0ced58dc1e6d93797a0e54004be27
author rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 29 20:27:16 2013
committer rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Mar 29 20:27:16 2013
tree 22d45dd235be4f70f5492793f8b7fcc23ef76b21
parent 69ceabd3799404eed6bda5d3f03a795b0d174931

Revert 191420 "PPAPI: Remove threading options; it's always on"

> PPAPI: Remove threading options; it's always on
> 
> This also re-enables thread checking for the host side resource and var trackers. Before, checking was disabled everywhere.
> 
> BUG=159240,92909
> 
> 
> Committed: r186925
> Reverted: r186939 due to build errors
> 
> Committed: r187340
> 
> Committed: r187427
> Reverted: r187668 due to a failing check in Canary, which was fixed here: r187681
> 
> Committed: r189518
> Reverted: r189682, due to regression in Kraken (see crbug.com/222741)
> 
> Review URL: https://chromiumcodereview.appspot.com/12378050

TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/13328006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191441 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/shared_impl/var_tracker.cc

diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc
index 951577c..434121e 100644
--- a/ppapi/shared_impl/var_tracker.cc
+++ b/ppapi/shared_impl/var_tracker.cc
@@ -29,29 +29,22 @@
       track_with_no_reference_count(0) {
 }
 
-VarTracker::VarTracker(ThreadMode thread_mode) : last_var_id_(0) {
-  if (thread_mode == SINGLE_THREADED)
-    thread_checker_.reset(new base::ThreadChecker);
+VarTracker::VarTracker() : last_var_id_(0) {
 }
 
 VarTracker::~VarTracker() {
 }
 
-void VarTracker::CheckThreadingPreconditions() const {
-  DCHECK(!thread_checker_ || thread_checker_->CalledOnValidThread());
-#ifndef NDEBUG
-  ProxyLock::AssertAcquired();
-#endif
-}
-
 int32 VarTracker::AddVar(Var* var) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   return AddVarInternal(var, ADD_VAR_TAKE_ONE_REFERENCE);
 }
 
 Var* VarTracker::GetVar(int32 var_id) const {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   VarMap::const_iterator result = live_vars_.find(var_id);
   if (result == live_vars_.end())
@@ -60,7 +53,8 @@
 }
 
 Var* VarTracker::GetVar(const PP_Var& var) const {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   if (!IsVarTypeRefcounted(var.type))
     return NULL;
@@ -68,7 +62,8 @@
 }
 
 bool VarTracker::AddRefVar(int32 var_id) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
       << var_id << " is not a PP_Var ID.";
@@ -93,7 +88,8 @@
 }
 
 bool VarTracker::AddRefVar(const PP_Var& var) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   if (!IsVarTypeRefcounted(var.type))
     return true;
@@ -101,7 +97,8 @@
 }
 
 bool VarTracker::ReleaseVar(int32 var_id) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
       << var_id << " is not a PP_Var ID.";
@@ -132,7 +129,8 @@
 }
 
 bool VarTracker::ReleaseVar(const PP_Var& var) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   if (!IsVarTypeRefcounted(var.type))
     return false;
@@ -156,7 +154,8 @@
 }
 
 int VarTracker::GetRefCountForObject(const PP_Var& plugin_object) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   VarMap::iterator found = GetLiveVar(plugin_object);
   if (found == live_vars_.end())
@@ -166,7 +165,8 @@
 
 int VarTracker::GetTrackedWithNoReferenceCountForObject(
     const PP_Var& plugin_object) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   VarMap::iterator found = GetLiveVar(plugin_object);
   if (found == live_vars_.end())
@@ -188,7 +188,8 @@
 }
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
@@ -198,7 +199,8 @@
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
                                         const void* data) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   ArrayBufferVar* array_buffer = MakeArrayBufferVar(size_in_bytes, data);
   return array_buffer ? array_buffer->GetPPVar() : PP_MakeNull();
@@ -206,7 +208,8 @@
 
 ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes,
                                                const void* data) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   ArrayBufferVar* array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
@@ -217,7 +220,7 @@
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
                                         base::SharedMemoryHandle handle) {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
 
   scoped_refptr<ArrayBufferVar> array_buffer(
       CreateShmArrayBuffer(size_in_bytes, handle));
@@ -227,7 +230,8 @@
 }
 
 std::vector<PP_Var> VarTracker::GetLiveVars() {
-  CheckThreadingPreconditions();
+  DCHECK(CalledOnValidThread());
+  ProxyLock::AssertAcquired();
 
   std::vector<PP_Var> var_vector;
   var_vector.reserve(live_vars_.size());