Reformat the WebRTC code base
Running clang-format with chromium's style guide. The goal is n-fold: * providing consistency and readability (that's what code guidelines are for) * preventing noise with presubmit checks and git cl format * building on the previous point: making it easier to automatically fix format issues * you name it Please consider using git-hyper-blame to ignore this commit. Bug: webrtc:9340 Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87 Reviewed-on: https://webrtc-review.googlesource.com/81185 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
Yves Gerey
86
api/proxy.h
86
api/proxy.h
@ -64,8 +64,10 @@ namespace webrtc {
|
||||
template <typename R>
|
||||
class ReturnType {
|
||||
public:
|
||||
template<typename C, typename M>
|
||||
void Invoke(C* c, M m) { r_ = (c->*m)(); }
|
||||
template <typename C, typename M>
|
||||
void Invoke(C* c, M m) {
|
||||
r_ = (c->*m)();
|
||||
}
|
||||
template <typename C, typename M, typename T1>
|
||||
void Invoke(C* c, M m, T1 a1) {
|
||||
r_ = (c->*m)(std::move(a1));
|
||||
@ -78,13 +80,22 @@ class ReturnType {
|
||||
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3) {
|
||||
r_ = (c->*m)(std::move(a1), std::move(a2), std::move(a3));
|
||||
}
|
||||
template<typename C, typename M, typename T1, typename T2, typename T3,
|
||||
typename T4>
|
||||
template <typename C,
|
||||
typename M,
|
||||
typename T1,
|
||||
typename T2,
|
||||
typename T3,
|
||||
typename T4>
|
||||
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4) {
|
||||
r_ = (c->*m)(std::move(a1), std::move(a2), std::move(a3), std::move(a4));
|
||||
}
|
||||
template<typename C, typename M, typename T1, typename T2, typename T3,
|
||||
typename T4, typename T5>
|
||||
template <typename C,
|
||||
typename M,
|
||||
typename T1,
|
||||
typename T2,
|
||||
typename T3,
|
||||
typename T4,
|
||||
typename T5>
|
||||
void Invoke(C* c, M m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) {
|
||||
r_ = (c->*m)(std::move(a1), std::move(a2), std::move(a3), std::move(a4),
|
||||
std::move(a5));
|
||||
@ -99,8 +110,10 @@ class ReturnType {
|
||||
template <>
|
||||
class ReturnType<void> {
|
||||
public:
|
||||
template<typename C, typename M>
|
||||
void Invoke(C* c, M m) { (c->*m)(); }
|
||||
template <typename C, typename M>
|
||||
void Invoke(C* c, M m) {
|
||||
(c->*m)();
|
||||
}
|
||||
template <typename C, typename M, typename T1>
|
||||
void Invoke(C* c, M m, T1 a1) {
|
||||
(c->*m)(std::move(a1));
|
||||
@ -119,9 +132,8 @@ class ReturnType<void> {
|
||||
|
||||
namespace internal {
|
||||
|
||||
class SynchronousMethodCall
|
||||
: public rtc::MessageData,
|
||||
public rtc::MessageHandler {
|
||||
class SynchronousMethodCall : public rtc::MessageData,
|
||||
public rtc::MessageHandler {
|
||||
public:
|
||||
explicit SynchronousMethodCall(rtc::MessageHandler* proxy);
|
||||
~SynchronousMethodCall() override;
|
||||
@ -138,8 +150,7 @@ class SynchronousMethodCall
|
||||
} // namespace internal
|
||||
|
||||
template <typename C, typename R>
|
||||
class MethodCall0 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
class MethodCall0 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)();
|
||||
MethodCall0(C* c, Method m) : c_(c), m_(m) {}
|
||||
@ -150,7 +161,7 @@ class MethodCall0 : public rtc::Message,
|
||||
}
|
||||
|
||||
private:
|
||||
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_); }
|
||||
void OnMessage(rtc::Message*) { r_.Invoke(c_, m_); }
|
||||
|
||||
C* c_;
|
||||
Method m_;
|
||||
@ -158,8 +169,7 @@ class MethodCall0 : public rtc::Message,
|
||||
};
|
||||
|
||||
template <typename C, typename R>
|
||||
class ConstMethodCall0 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
class ConstMethodCall0 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)() const;
|
||||
ConstMethodCall0(C* c, Method m) : c_(c), m_(m) {}
|
||||
@ -177,9 +187,8 @@ class ConstMethodCall0 : public rtc::Message,
|
||||
ReturnType<R> r_;
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1>
|
||||
class MethodCall1 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
template <typename C, typename R, typename T1>
|
||||
class MethodCall1 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1);
|
||||
MethodCall1(C* c, Method m, T1 a1) : c_(c), m_(m), a1_(std::move(a1)) {}
|
||||
@ -198,9 +207,8 @@ class MethodCall1 : public rtc::Message,
|
||||
T1 a1_;
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1>
|
||||
class ConstMethodCall1 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
template <typename C, typename R, typename T1>
|
||||
class ConstMethodCall1 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1) const;
|
||||
ConstMethodCall1(C* c, Method m, T1 a1) : c_(c), m_(m), a1_(std::move(a1)) {}
|
||||
@ -220,8 +228,7 @@ class ConstMethodCall1 : public rtc::Message,
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1, typename T2>
|
||||
class MethodCall2 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
class MethodCall2 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1, T2 a2);
|
||||
MethodCall2(C* c, Method m, T1 a1, T2 a2)
|
||||
@ -245,8 +252,7 @@ class MethodCall2 : public rtc::Message,
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1, typename T2, typename T3>
|
||||
class MethodCall3 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
class MethodCall3 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3);
|
||||
MethodCall3(C* c, Method m, T1 a1, T2 a2, T3 a3)
|
||||
@ -274,10 +280,13 @@ class MethodCall3 : public rtc::Message,
|
||||
T3 a3_;
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1, typename T2, typename T3,
|
||||
typename T4>
|
||||
class MethodCall4 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
template <typename C,
|
||||
typename R,
|
||||
typename T1,
|
||||
typename T2,
|
||||
typename T3,
|
||||
typename T4>
|
||||
class MethodCall4 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3, T4 a4);
|
||||
MethodCall4(C* c, Method m, T1 a1, T2 a2, T3 a3, T4 a4)
|
||||
@ -308,10 +317,14 @@ class MethodCall4 : public rtc::Message,
|
||||
T4 a4_;
|
||||
};
|
||||
|
||||
template <typename C, typename R, typename T1, typename T2, typename T3,
|
||||
typename T4, typename T5>
|
||||
class MethodCall5 : public rtc::Message,
|
||||
public rtc::MessageHandler {
|
||||
template <typename C,
|
||||
typename R,
|
||||
typename T1,
|
||||
typename T2,
|
||||
typename T3,
|
||||
typename T4,
|
||||
typename T5>
|
||||
class MethodCall5 : public rtc::Message, public rtc::MessageHandler {
|
||||
public:
|
||||
typedef R (C::*Method)(T1 a1, T2 a2, T3 a3, T4 a4, T5 a5);
|
||||
MethodCall5(C* c, Method m, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5)
|
||||
@ -344,7 +357,6 @@ class MethodCall5 : public rtc::Message,
|
||||
T5 a5_;
|
||||
};
|
||||
|
||||
|
||||
// Helper macros to reduce code duplication.
|
||||
#define PROXY_MAP_BOILERPLATE(c) \
|
||||
template <class INTERNAL_CLASS> \
|
||||
@ -359,8 +371,12 @@ class MethodCall5 : public rtc::Message,
|
||||
const INTERNAL_CLASS* internal() const { return c_; } \
|
||||
INTERNAL_CLASS* internal() { return c_; }
|
||||
|
||||
// clang-format off
|
||||
// clang-format would put the semicolon alone,
|
||||
// leading to a presubmit error (cpplint.py)
|
||||
#define END_PROXY_MAP() \
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
#define SIGNALING_PROXY_MAP_BOILERPLATE(c) \
|
||||
protected: \
|
||||
|
||||
Reference in New Issue
Block a user