From 385b56666a6ea8841517efabecd0955f1279ad47 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 9 Mar 2015 10:43:18 +0000 Subject: [PATCH] Revert "Workaround Mac align bug for observer_ and crit_." This reverts commit r8528 which should be safe after r8646. BUG= R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/40249004 Cr-Commit-Position: refs/heads/master@{#8648} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8648 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_capturer.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc index ce3b715185..bd9d8a31e1 100644 --- a/webrtc/video_engine/vie_capturer.cc +++ b/webrtc/video_engine/vie_capturer.cc @@ -52,11 +52,8 @@ class RegistrableCpuOveruseMetricsObserver : public CpuOveruseMetricsObserver { } private: - // 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_; + CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr; CpuOveruseMetrics metrics_ GUARDED_BY(crit_); };