зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1314884. Part 7 - remove SeekResolveValue::mEventVisibility for we always assume MediaDecoderEventVisibility::Observable in P6. r=kaku
MozReview-Commit-ID: 8jUaFPkQQxA --HG-- extra : rebase_source : 4e3794979ec05c588458ed72472252910d1642b9 extra : source : 565d6e04892b0d8ea7fcd34d5d279f63ec21d245
This commit is contained in:
Родитель
8055ca2d43
Коммит
c2bf477b21
|
@ -1144,14 +1144,12 @@ MediaDecoder::OnSeekResolved(SeekResolveValue aVal)
|
|||
}
|
||||
|
||||
// Ensure logical position is updated after seek.
|
||||
UpdateLogicalPositionInternal(aVal.mEventVisibility);
|
||||
UpdateLogicalPositionInternal();
|
||||
|
||||
if (aVal.mEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
||||
mOwner->SeekCompleted();
|
||||
AsyncResolveSeekDOMPromiseIfExists();
|
||||
if (fireEnded) {
|
||||
mOwner->PlaybackEnded();
|
||||
}
|
||||
mOwner->SeekCompleted();
|
||||
AsyncResolveSeekDOMPromiseIfExists();
|
||||
if (fireEnded) {
|
||||
mOwner->PlaybackEnded();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1193,7 +1191,7 @@ MediaDecoder::ChangeState(PlayState aState)
|
|||
}
|
||||
|
||||
void
|
||||
MediaDecoder::UpdateLogicalPositionInternal(MediaDecoderEventVisibility aEventVisibility)
|
||||
MediaDecoder::UpdateLogicalPositionInternal()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(!IsShutdown());
|
||||
|
@ -1211,8 +1209,7 @@ MediaDecoder::UpdateLogicalPositionInternal(MediaDecoderEventVisibility aEventVi
|
|||
// frame has reflowed and the size updated beforehand.
|
||||
Invalidate();
|
||||
|
||||
if (logicalPositionChanged &&
|
||||
aEventVisibility != MediaDecoderEventVisibility::Suppressed) {
|
||||
if (logicalPositionChanged) {
|
||||
FireTimeUpdate();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,10 +59,7 @@ class MediaDecoder : public AbstractMediaDecoder
|
|||
{
|
||||
public:
|
||||
struct SeekResolveValue {
|
||||
SeekResolveValue(bool aAtEnd, MediaDecoderEventVisibility aEventVisibility)
|
||||
: mAtEnd(aAtEnd), mEventVisibility(aEventVisibility) {}
|
||||
bool mAtEnd;
|
||||
MediaDecoderEventVisibility mEventVisibility;
|
||||
};
|
||||
|
||||
// Used to register with MediaResource to receive notifications which will
|
||||
|
@ -402,7 +399,7 @@ private:
|
|||
// Seeking has started. Inform the element on the main thread.
|
||||
void SeekingStarted();
|
||||
|
||||
void UpdateLogicalPositionInternal(MediaDecoderEventVisibility aEventVisibility);
|
||||
void UpdateLogicalPositionInternal();
|
||||
void UpdateLogicalPosition()
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
@ -411,7 +408,7 @@ private:
|
|||
if (mPlayState == PLAY_STATE_PAUSED || IsSeeking()) {
|
||||
return;
|
||||
}
|
||||
UpdateLogicalPositionInternal(MediaDecoderEventVisibility::Observable);
|
||||
UpdateLogicalPositionInternal();
|
||||
}
|
||||
|
||||
// Find the end of the cached data starting at the current decoder
|
||||
|
|
|
@ -41,7 +41,8 @@ bool SeekJob::Exists() const
|
|||
|
||||
void SeekJob::Resolve(bool aAtEnd, const char* aCallSite)
|
||||
{
|
||||
MediaDecoder::SeekResolveValue val(aAtEnd, MediaDecoderEventVisibility::Observable);
|
||||
MediaDecoder::SeekResolveValue val;
|
||||
val.mAtEnd = aAtEnd;
|
||||
mPromise.Resolve(val, aCallSite);
|
||||
mTarget.Reset();
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче