Bug 1421025 - fix build break with --disable-webrtc. r=tjr
authorMunro Mengjue Chiang <mchiang@mozilla.com>
Tue, 28 Nov 2017 10:59:25 +0800
changeset 393895 1a69438ec05f314572ff526291e0a1b0ea756953
parent 393894 497aeea4657b7d37cd8851e6f85bf0a65e1a336f
child 393896 cff54d05bcad74654249e2a2d4735b491bc452fd
push id32984
push usercbrindusan@mozilla.com
push dateTue, 28 Nov 2017 09:48:29 +0000
treeherdermozilla-central@cff54d05bcad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstjr
bugs1421025
milestone59.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 1421025 - fix build break with --disable-webrtc. r=tjr MozReview-Commit-ID: hsArstlQRX
dom/media/webrtc/MediaEngine.h
--- a/dom/media/webrtc/MediaEngine.h
+++ b/dom/media/webrtc/MediaEngine.h
@@ -222,24 +222,26 @@ public:
     AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
                      const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
                      const MediaEnginePrefs& aPrefs,
                      const nsString& aDeviceId)
 
     : mConstraints(aConstraints),
       mPrincipalInfo(aPrincipalInfo),
       mPrefs(aPrefs),
-      mDeviceId(aDeviceId),
-      mId(sId++) {}
+#ifdef MOZ_WEBRTC
+      mId(sId++),
+#endif
+      mDeviceId(aDeviceId) {}
   public:
     NormalizedConstraints mConstraints;
     mozilla::ipc::PrincipalInfo mPrincipalInfo;
     MediaEnginePrefs mPrefs;
+    uint64_t mId;
     nsString mDeviceId;
-    uint64_t mId;
   };
 
   /* Release the device back to the system. */
   virtual nsresult Deallocate(AllocationHandle* aHandle)
   {
     MOZ_ASSERT(aHandle);
     RefPtr<AllocationHandle> handle = aHandle;