зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1371514. P2 - remove MediaDecoder::mStateMachineIsShutdown. r=gerald
MozReview-Commit-ID: Dv2pdHW2tgI --HG-- extra : rebase_source : aea740ced32fe31185127617102f026b1ad0349e
This commit is contained in:
Родитель
ba75abc972
Коммит
a61afab096
|
@ -392,7 +392,6 @@ MediaDecoder::MediaDecoder(MediaDecoderInit& aInit)
|
|||
, mForcedHidden(false)
|
||||
, mHasSuspendTaint(aInit.mHasSuspendTaint)
|
||||
, mPlaybackRate(aInit.mPlaybackRate)
|
||||
, INIT_MIRROR(mStateMachineIsShutdown, true)
|
||||
, INIT_MIRROR(mBuffered, TimeIntervals())
|
||||
, INIT_MIRROR(mNextFrameStatus, MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE)
|
||||
, INIT_MIRROR(mCurrentPosition, TimeUnit::Zero())
|
||||
|
@ -1454,7 +1453,6 @@ MediaDecoder::ConnectMirrors(MediaDecoderStateMachine* aObject)
|
|||
MOZ_ASSERT(aObject);
|
||||
mStateMachineDuration.Connect(aObject->CanonicalDuration());
|
||||
mBuffered.Connect(aObject->CanonicalBuffered());
|
||||
mStateMachineIsShutdown.Connect(aObject->CanonicalIsShutdown());
|
||||
mNextFrameStatus.Connect(aObject->CanonicalNextFrameStatus());
|
||||
mCurrentPosition.Connect(aObject->CanonicalCurrentPosition());
|
||||
mPlaybackPosition.Connect(aObject->CanonicalPlaybackOffset());
|
||||
|
@ -1467,7 +1465,6 @@ MediaDecoder::DisconnectMirrors()
|
|||
MOZ_ASSERT(NS_IsMainThread());
|
||||
mStateMachineDuration.DisconnectIfConnected();
|
||||
mBuffered.DisconnectIfConnected();
|
||||
mStateMachineIsShutdown.DisconnectIfConnected();
|
||||
mNextFrameStatus.DisconnectIfConnected();
|
||||
mCurrentPosition.DisconnectIfConnected();
|
||||
mPlaybackPosition.DisconnectIfConnected();
|
||||
|
|
|
@ -740,9 +740,6 @@ protected:
|
|||
// PlaybackRate and pitch preservation status we should start at.
|
||||
double mPlaybackRate;
|
||||
|
||||
// Whether the state machine is shut down.
|
||||
Mirror<bool> mStateMachineIsShutdown;
|
||||
|
||||
// Buffered range, mirrored from the reader.
|
||||
Mirror<media::TimeIntervals> mBuffered;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче