From 6c2e506cf411ed75bee4132c5b4d0e075795014a Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 27 Feb 2015 14:28:15 +0000 Subject: [PATCH] Workaround Mac align bug for observer_ and crit_. Unblocks rolling WebRTC into Chromium so we can debug what's actually going on. BUG= R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39329004 Cr-Commit-Position: refs/heads/master@{#8528} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8528 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_capturer.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc index 34c5754b55..0134c32001 100644 --- a/webrtc/video_engine/vie_capturer.cc +++ b/webrtc/video_engine/vie_capturer.cc @@ -53,8 +53,11 @@ class RegistrableCpuOveruseMetricsObserver : public CpuOveruseMetricsObserver { } private: - mutable rtc::CriticalSection crit_; + // TODO(pbos): Figure out why observer_ needs to be declared above crit_ on + // Mac. tommi@ also ran into this while debugging weird critical-section + // related alignment issues. Pushing this as a workaround to unblock rolling. CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr; + mutable rtc::CriticalSection crit_; CpuOveruseMetrics metrics_ GUARDED_BY(crit_); };