Bug 1249244 - Add missing argument to MediaEngineGonkVideoSource::Allocate. draft
authorKan-Ru Chen <kanru@kanru.info>
Thu, 18 Feb 2016 18:52:37 +0800
changeset 331830 11768ef9125893f85d2169d31f4265166de70f6f
parent 331829 f5a6fa884f9f478f660b733459ec2df6b5d70576
child 514471 ae6b997d4491fa2654aecaba37a14b6736826aa5
push id11084
push userbmo:kchen@mozilla.com
push dateThu, 18 Feb 2016 10:53:16 +0000
bugs1249244
milestone47.0a1
Bug 1249244 - Add missing argument to MediaEngineGonkVideoSource::Allocate. MozReview-Commit-ID: 5va5cHFqlja
dom/media/webrtc/MediaEngineGonkVideoSource.cpp
dom/media/webrtc/MediaEngineGonkVideoSource.h
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -143,17 +143,18 @@ MediaEngineGonkVideoSource::NumCapabilit
     }
   }
   return mHardcodedCapabilities.Length();
 }
 
 nsresult
 MediaEngineGonkVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints,
                                      const MediaEnginePrefs& aPrefs,
-                                     const nsString& aDeviceId)
+                                     const nsString& aDeviceId,
+                                     const nsACString& aOrigin)
 {
   LOG((__FUNCTION__));
 
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
   if (mState == kReleased && mInitDone) {
     ChooseCapability(aConstraints, aPrefs, aDeviceId);
     NS_DispatchToMainThread(WrapRunnable(RefPtr<MediaEngineGonkVideoSource>(this),
                                          &MediaEngineGonkVideoSource::AllocImpl));
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.h
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.h
@@ -57,17 +57,18 @@ public:
     , mBackCamera(false)
     , mOrientationChanged(true) // Correct the orientation at first time takePhoto.
     {
       Init();
     }
 
   nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                     const MediaEnginePrefs &aPrefs,
-                    const nsString& aDeviceId) override;
+                    const nsString& aDeviceId,
+                    const nsACString& aOrigin) override;
   nsresult Deallocate() override;
   nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
   nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
   nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                    const MediaEnginePrefs &aPrefs,
                    const nsString& aDeviceId) override;
   void NotifyPull(MediaStreamGraph* aGraph,
                   SourceMediaStream* aSource,