Enable the clang style plugin in primary p2p/ target
Bug: webrtc:163
Change-Id: I318982ee549fe71cd48f74cdfad4173506742411
Reviewed-on: https://webrtc-review.googlesource.com/17040
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20509}diff --git a/api/BUILD.gn b/api/BUILD.gn
index 72078b4..bad3a51 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -53,6 +53,7 @@
"notifier.h",
"peerconnectionfactoryproxy.h",
"peerconnectionproxy.h",
+ "proxy.cc",
"proxy.h",
"rtcerror.cc",
"rtcerror.h",
@@ -63,6 +64,7 @@
"statstypes.cc",
"statstypes.h",
"turncustomizer.h",
+ "umametrics.cc",
"umametrics.h",
"videosourceproxy.h",
]
diff --git a/api/proxy.cc b/api/proxy.cc
new file mode 100644
index 0000000..c86bddf
--- /dev/null
+++ b/api/proxy.cc
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/proxy.h"
+
+namespace webrtc {
+namespace internal {
+
+SynchronousMethodCall::SynchronousMethodCall(rtc::MessageHandler* proxy)
+ : e_(), proxy_(proxy) {}
+
+SynchronousMethodCall::~SynchronousMethodCall() = default;
+
+void SynchronousMethodCall::Invoke(const rtc::Location& posted_from,
+ rtc::Thread* t) {
+ if (t->IsCurrent()) {
+ proxy_->OnMessage(nullptr);
+ } else {
+ e_.reset(new rtc::Event(false, false));
+ t->Post(posted_from, this, 0);
+ e_->Wait(rtc::Event::kForever);
+ }
+}
+
+void SynchronousMethodCall::OnMessage(rtc::Message*) {
+ proxy_->OnMessage(nullptr);
+ e_->Set();
+}
+
+} // namespace internal
+} // namespace webrtc
diff --git a/api/proxy.h b/api/proxy.h
index 175c6b7..dd7182e 100644
--- a/api/proxy.h
+++ b/api/proxy.h
@@ -123,25 +123,14 @@
: public rtc::MessageData,
public rtc::MessageHandler {
public:
- explicit SynchronousMethodCall(rtc::MessageHandler* proxy)
- : e_(), proxy_(proxy) {}
- ~SynchronousMethodCall() {}
+ explicit SynchronousMethodCall(rtc::MessageHandler* proxy);
+ ~SynchronousMethodCall() override;
- void Invoke(const rtc::Location& posted_from, rtc::Thread* t) {
- if (t->IsCurrent()) {
- proxy_->OnMessage(nullptr);
- } else {
- e_.reset(new rtc::Event(false, false));
- t->Post(posted_from, this, 0);
- e_->Wait(rtc::Event::kForever);
- }
- }
+ void Invoke(const rtc::Location& posted_from, rtc::Thread* t);
private:
- void OnMessage(rtc::Message*) {
- proxy_->OnMessage(nullptr);
- e_->Set();
- }
+ void OnMessage(rtc::Message*) override;
+
std::unique_ptr<rtc::Event> e_;
rtc::MessageHandler* proxy_;
};
diff --git a/api/umametrics.cc b/api/umametrics.cc
new file mode 100644
index 0000000..d5f2bb6
--- /dev/null
+++ b/api/umametrics.cc
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/umametrics.h"
+
+namespace webrtc {
+
+void MetricsObserverInterface::IncrementSparseEnumCounter(
+ PeerConnectionEnumCounterType type,
+ int counter) {
+ IncrementEnumCounter(type, counter, 0 /* Ignored */);
+}
+
+} // namespace webrtc
diff --git a/api/umametrics.h b/api/umametrics.h
index 825950d..c512598 100644
--- a/api/umametrics.h
+++ b/api/umametrics.h
@@ -124,15 +124,10 @@
// TODO(guoweis): Remove the implementation once the dependency's interface
// definition is updated.
virtual void IncrementSparseEnumCounter(PeerConnectionEnumCounterType type,
- int counter) {
- IncrementEnumCounter(type, counter, 0 /* Ignored */);
- }
+ int counter);
virtual void AddHistogramSample(PeerConnectionMetricsName type,
int value) = 0;
-
- protected:
- virtual ~MetricsObserverInterface() {}
};
typedef MetricsObserverInterface UMAObserver;
