Bug 1447982 - Remove unused MediaEnginePrefs from AllocationHandle. r?padenot draft
authorAndreas Pehrson <pehrsons@mozilla.com>
Mon, 26 Mar 2018 12:15:56 +0200
changeset 781069 c47ba651e3de2ba1687b28b2256934e6d46addaf
parent 781068 c0b40d29e6cbfe04539c029d59edb0a6f7f6a6b3
child 781070 28e8885e97ff560b926f17cf754371880d47b954
push id106197
push userbmo:apehrson@mozilla.com
push dateThu, 12 Apr 2018 13:32:52 +0000
reviewerspadenot
bugs1447982
milestone61.0a1
Bug 1447982 - Remove unused MediaEnginePrefs from AllocationHandle. r?padenot MozReview-Commit-ID: 3gIU7MCddWG
dom/media/webrtc/AllocationHandle.h
dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- a/dom/media/webrtc/AllocationHandle.h
+++ b/dom/media/webrtc/AllocationHandle.h
@@ -39,27 +39,24 @@ public:
     return sId++;
   }
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AllocationHandle);
 
   AllocationHandle() = delete;
   AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
                    const ipc::PrincipalInfo& aPrincipalInfo,
-                   const MediaEnginePrefs& aPrefs,
                    const nsString& aDeviceId)
     : mId(GetUniqueId())
     , mDeviceId(aDeviceId)
     , mPrincipalInfo(aPrincipalInfo)
     , mConstraints(aConstraints)
-    , mPrefs(aPrefs)
   {}
 
   const uint64_t mId;
   const nsString mDeviceId;
   const ipc::PrincipalInfo mPrincipalInfo;
   NormalizedConstraints mConstraints;
-  MediaEnginePrefs mPrefs;
 };
 
 } // namespace mozilla
 
 #endif // AllocationHandle_h
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -581,17 +581,17 @@ MediaEngineWebRTCMicrophoneSource::Alloc
                                             const nsString& aDeviceId,
                                             const ipc::PrincipalInfo& aPrincipalInfo,
                                             AllocationHandle** aOutHandle,
                                             const char** aOutBadConstraint)
 {
   AssertIsOnOwningThread();
   MOZ_ASSERT(aOutHandle);
   auto handle = MakeRefPtr<AllocationHandle>(aConstraints, aPrincipalInfo,
-                                             aPrefs, aDeviceId);
+                                             aDeviceId);
 
   LOG(("Mic source %p allocation %p Allocate()", this, handle.get()));
 
   nsresult rv = ReevaluateAllocation(handle, nullptr, aPrefs, aDeviceId,
                                      aOutBadConstraint);
   if (NS_FAILED(rv)) {
     return rv;
   }