Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: ppapi/shared_impl/proxy_lock.cc

Issue 9034035: Make it possible to have 1 PpapiGlobals per thread. Update unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test. Cleanup. Move proxy lock to globals. Created 8 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/shared_impl/proxy_lock.cc
diff --git a/ppapi/shared_impl/proxy_lock.cc b/ppapi/shared_impl/proxy_lock.cc
index 3d8493052a56a168e0ad5cf7ef65741d98b54154..723c0c4b3ddd883967b5fc1f522143f76311dfaf 100644
--- a/ppapi/shared_impl/proxy_lock.cc
+++ b/ppapi/shared_impl/proxy_lock.cc
@@ -5,6 +5,7 @@
#include "ppapi/shared_impl/proxy_lock.h"
#include "base/synchronization/lock.h"
+#include "ppapi/shared_impl/ppapi_globals.h"
namespace ppapi {
@@ -12,24 +13,16 @@ base::Lock* ProxyLock::lock_ = NULL;
// static
void ProxyLock::Acquire() {
- if (lock_)
- lock_->Acquire();
+ base::Lock* lock(PpapiGlobals::Get()->GetProxyLock());
brettw 2012/01/05 23:41:20 Is this class useful anymore? I probably just woul
dmichael (off chromium) 2012/01/06 18:18:45 I agree, that would be nicer for right now, and I
+ if (lock)
+ lock->Acquire();
}
// static
void ProxyLock::Release() {
- if (lock_)
- lock_->Release();
-}
-
-// static
-void ProxyLock::Set(base::Lock* lock) {
- lock_ = lock;
-}
-
-// static
-void ProxyLock::Reset() {
- Set(NULL);
+ base::Lock* lock(PpapiGlobals::Get()->GetProxyLock());
+ if (lock)
+ lock->Release();
}
} // namespace ppapi

Powered by Google App Engine
This is Rietveld 408576698