Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.h

Issue 1810513002: Media element resource selection algorithm should "await a stable state" Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address review comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index a90d46750ed94108f3485e12de823c6ced35d227..3e12e6199110aac43e30fd35ae2d924d1cdd6169 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -347,7 +347,7 @@ private:
void disconnectedFromRemoteDevice() final;
void cancelledRemotePlaybackRequest() final;
- void loadTimerFired(Timer<HTMLMediaElement>*);
+ void textTrackLoadTimerFired(Timer<HTMLMediaElement>*);
void progressEventTimerFired(Timer<HTMLMediaElement>*);
void playbackProgressTimerFired(Timer<HTMLMediaElement>*);
void startPlaybackProgressTimer();
@@ -364,14 +364,16 @@ private:
// loading
void invokeLoadAlgorithm();
void invokeResourceSelectionAlgorithm();
+ void continueResourceSelectionAlgorithm();
+ void enqueueMicrotaskForResourceSelectionAlgorithmContinuation();
void loadInternal();
void selectMediaResource();
void loadResource(const KURL&, ContentType&);
void startPlayerLoad();
void setPlayerPreload();
WebMediaPlayer::LoadType loadType() const;
- void scheduleNextSourceChild();
void loadNextSourceChild();
+ void loadNextSourceChildOnError();
void clearMediaPlayer();
void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();
bool havePotentialSourceChild();
@@ -474,7 +476,7 @@ private:
void rejectPlayPromises();
void rejectPlayPromises(ExceptionCode, const String&);
- UnthrottledTimer<HTMLMediaElement> m_loadTimer;
+ UnthrottledTimer<HTMLMediaElement> m_textTrackLoadTimer;
UnthrottledTimer<HTMLMediaElement> m_progressEventTimer;
UnthrottledTimer<HTMLMediaElement> m_playbackProgressTimer;
UnthrottledTimer<HTMLMediaElement> m_audioTracksTimer;
@@ -542,9 +544,6 @@ private:
double m_fragmentEndTime;
- typedef unsigned PendingActionFlags;
- PendingActionFlags m_pendingActionFlags;
-
// FIXME: HTMLMediaElement has way too many state bits.
bool m_userGestureRequiredForPlay : 1;
bool m_playing : 1;
@@ -584,6 +583,9 @@ private:
OwnPtr<CancellableTaskFactory> m_playPromiseRejectTask;
ExceptionCode m_playPromiseErrorCode;
+ OwnPtr<CancellableTaskFactory> m_resourceSelectionAlgorithmContinuationTask;
+ OwnPtr<CancellableTaskFactory> m_loadNextSourceChildOnErrorTask;
+
// This is a weak reference, since m_audioSourceNode holds a reference to us.
// FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
GC_PLUGIN_IGNORE("http://crbug.com/404577")

Powered by Google App Engine
This is Rietveld 408576698