Bug 879717: bustage fix (unified builds) r=bustage
☠☠ backed out by 189ac924dfa6 ☠ ☠
authorRandell Jesup <rjesup@jesup.org>
Mon, 13 Oct 2014 01:01:51 -0400
changeset 233288 ef6465b02d0d15a0f29b4f0d8823994feb6658da
parent 233287 1ae70cece64666ec6a76d0b2dd9b2b02287b54c2
child 233289 42f385becea7de066e18d6ac744153f0c198ac34
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs879717
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 879717: bustage fix (unified builds) r=bustage
dom/camera/CameraPreviewMediaStream.cpp
--- a/dom/camera/CameraPreviewMediaStream.cpp
+++ b/dom/camera/CameraPreviewMediaStream.cpp
@@ -12,19 +12,19 @@
  * either very busy or the device is busy elsewhere (e.g. encoding or
  * persisting video data).
  */
 #define MAX_INVALIDATE_PENDING 4
 
 using namespace mozilla::layers;
 using namespace mozilla::dom;
 
-static const TrackID TRACK_VIDEO = 2;
+namespace mozilla {
 
-namespace mozilla {
+static const TrackID TRACK_VIDEO = 2;
 
 void
 FakeMediaStreamGraph::DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable)
 {
   nsRefPtr<nsIRunnable> task = aRunnable;
   NS_DispatchToMainThread(task);
 }