Bug 1249244 - Add missing argument to MediaEngineGonkVideoSource::Allocate.
MozReview-Commit-ID: 5va5cHFqlja
--- 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,