Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 7545f9159a1b (bug 1294605)

Browse Source 
CLOSED TREE
This commit is contained in:
Iris Hsiao 2016-10-26 17:54:40 +08:00
parent 750c49cf6f
commit ee5f311064
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/media/MediaStreamTrack.cpp
View File

@ -387,22 +387,6 @@ MediaStreamTrack::Clone()
return newStream->CloneDOMTrack(*this, mTrackID);
}
void
MediaStreamTrack::SetReadyState(MediaStreamTrackState aState)
{
MOZ_ASSERT(!(mReadyState == MediaStreamTrackState::Ended &&
aState == MediaStreamTrackState::Live),
"We don't support overriding the ready state from ended to live");
if (mReadyState == MediaStreamTrackState::Live &&
aState == MediaStreamTrackState::Ended &&
mSource) {
mSource->UnregisterSink(this);
}
mReadyState = aState;
}
void
MediaStreamTrack::NotifyEnded()
{

2
dom/media/MediaStreamTrack.h
View File

@ -297,7 +297,7 @@ public:
* Forces the ready state to a particular value, for instance when we're
* cloning an already ended track.
*/
void SetReadyState(MediaStreamTrackState aState);
void SetReadyState(MediaStreamTrackState aState) { mReadyState = aState; }
/**
* Notified by the MediaStreamGraph, through our owning MediaStream on the