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

Unified Diff: ppapi/shared_impl/proxy_lock.h

Issue 174213003: PPAPI: Use clang-format on ppapi/shared_impl (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove DEPS Created 6 years, 10 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
« no previous file with comments | « ppapi/shared_impl/ppp_instance_combined.cc ('k') | ppapi/shared_impl/proxy_lock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/proxy_lock.h
diff --git a/ppapi/shared_impl/proxy_lock.h b/ppapi/shared_impl/proxy_lock.h
index f6dea318417093e9b08754c565e253e6ebb10298..8e82ea609aa988f396816bf336552b6c30e4e63a 100644
--- a/ppapi/shared_impl/proxy_lock.h
+++ b/ppapi/shared_impl/proxy_lock.h
@@ -81,12 +81,9 @@ class PPAPI_SHARED_EXPORT ProxyLock {
// such as PPB_Var and PPB_Core.
class ProxyAutoLock {
public:
- ProxyAutoLock() {
- ProxyLock::Acquire();
- }
- ~ProxyAutoLock() {
- ProxyLock::Release();
- }
+ ProxyAutoLock() { ProxyLock::Acquire(); }
+ ~ProxyAutoLock() { ProxyLock::Release(); }
+
private:
DISALLOW_COPY_AND_ASSIGN(ProxyAutoLock);
};
@@ -97,12 +94,9 @@ class ProxyAutoLock {
// exception.
class ProxyAutoUnlock {
public:
- ProxyAutoUnlock() {
- ProxyLock::Release();
- }
- ~ProxyAutoUnlock() {
- ProxyLock::Acquire();
- }
+ ProxyAutoUnlock() { ProxyLock::Release(); }
+ ~ProxyAutoUnlock() { ProxyLock::Acquire(); }
+
private:
DISALLOW_COPY_AND_ASSIGN(ProxyAutoUnlock);
};
@@ -170,9 +164,9 @@ template <typename RunType>
class RunWhileLockedHelper;
template <>
-class RunWhileLockedHelper<void ()> {
+class RunWhileLockedHelper<void()> {
public:
- typedef base::Callback<void ()> CallbackType;
+ typedef base::Callback<void()> CallbackType;
explicit RunWhileLockedHelper(const CallbackType& callback)
: callback_(new CallbackType(callback)) {
// Copying |callback| may adjust reference counts for bound Vars or
@@ -224,6 +218,7 @@ class RunWhileLockedHelper<void ()> {
callback_.reset();
}
}
+
private:
scoped_ptr<CallbackType> callback_;
@@ -232,9 +227,9 @@ class RunWhileLockedHelper<void ()> {
};
template <typename P1>
-class RunWhileLockedHelper<void (P1)> {
+class RunWhileLockedHelper<void(P1)> {
public:
- typedef base::Callback<void (P1)> CallbackType;
+ typedef base::Callback<void(P1)> CallbackType;
explicit RunWhileLockedHelper(const CallbackType& callback)
: callback_(new CallbackType(callback)) {
ProxyLock::AssertAcquired();
@@ -255,15 +250,16 @@ class RunWhileLockedHelper<void (P1)> {
callback_.reset();
}
}
+
private:
scoped_ptr<CallbackType> callback_;
base::ThreadChecker thread_checker_;
};
template <typename P1, typename P2>
-class RunWhileLockedHelper<void (P1, P2)> {
+class RunWhileLockedHelper<void(P1, P2)> {
public:
- typedef base::Callback<void (P1, P2)> CallbackType;
+ typedef base::Callback<void(P1, P2)> CallbackType;
explicit RunWhileLockedHelper(const CallbackType& callback)
: callback_(new CallbackType(callback)) {
ProxyLock::AssertAcquired();
@@ -284,15 +280,16 @@ class RunWhileLockedHelper<void (P1, P2)> {
callback_.reset();
}
}
+
private:
scoped_ptr<CallbackType> callback_;
base::ThreadChecker thread_checker_;
};
template <typename P1, typename P2, typename P3>
-class RunWhileLockedHelper<void (P1, P2, P3)> {
+class RunWhileLockedHelper<void(P1, P2, P3)> {
public:
- typedef base::Callback<void (P1, P2, P3)> CallbackType;
+ typedef base::Callback<void(P1, P2, P3)> CallbackType;
explicit RunWhileLockedHelper(const CallbackType& callback)
: callback_(new CallbackType(callback)) {
ProxyLock::AssertAcquired();
@@ -313,6 +310,7 @@ class RunWhileLockedHelper<void (P1, P2, P3)> {
callback_.reset();
}
}
+
private:
scoped_ptr<CallbackType> callback_;
base::ThreadChecker thread_checker_;
@@ -349,8 +347,8 @@ class RunWhileLockedHelper<void (P1, P2, P3)> {
// was run (but can be destroyed with or without the proxy lock acquired). Or
// (3) destroyed without the proxy lock acquired.
template <class FunctionType>
-inline base::Callback<FunctionType>
-RunWhileLocked(const base::Callback<FunctionType>& callback) {
+inline base::Callback<FunctionType> RunWhileLocked(
+ const base::Callback<FunctionType>& callback) {
internal::RunWhileLockedHelper<FunctionType>* helper =
new internal::RunWhileLockedHelper<FunctionType>(callback);
return base::Bind(
« no previous file with comments | « ppapi/shared_impl/ppp_instance_combined.cc ('k') | ppapi/shared_impl/proxy_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698