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 8eba5e45da8e1d0c34faab31218ac8a4b36a2433..0a961154d5b8d70ab6ddb8a62de4619e0f84b3e6 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
@@ -354,7 +354,7 @@ private: |
void cancelledRemotePlaybackRequest() final; |
void requestReload(const WebURL&) final; |
- void loadTimerFired(TimerBase*); |
+ void textTrackLoadTimerFired(TimerBase*); |
void progressEventTimerFired(TimerBase*); |
void playbackProgressTimerFired(TimerBase*); |
void startPlaybackProgressTimer(); |
@@ -371,6 +371,7 @@ private: |
// loading |
void invokeLoadAlgorithm(); |
void invokeResourceSelectionAlgorithm(); |
+ void continueResourceSelectionAlgorithm(); |
void loadInternal(); |
void selectMediaResource(); |
void loadResource(const WebMediaPlayerSource&, const ContentType&); |
@@ -381,6 +382,7 @@ private: |
void loadSourceFromObject(); |
void loadSourceFromAttribute(); |
void loadNextSourceChild(); |
+ void loadNextSourceChildAfterError(); |
void clearMediaPlayer(); |
void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking(); |
bool havePotentialSourceChild(); |
@@ -497,7 +499,7 @@ private: |
void onVisibilityChangedForAutoplay(bool isVisible); |
- UnthrottledThreadTimer<HTMLMediaElement> m_loadTimer; |
+ UnthrottledThreadTimer<HTMLMediaElement> m_textTrackLoadTimer; |
UnthrottledThreadTimer<HTMLMediaElement> m_progressEventTimer; |
UnthrottledThreadTimer<HTMLMediaElement> m_playbackProgressTimer; |
UnthrottledThreadTimer<HTMLMediaElement> m_audioTracksTimer; |
@@ -566,9 +568,6 @@ private: |
double m_fragmentEndTime; |
- typedef unsigned PendingActionFlags; |
- PendingActionFlags m_pendingActionFlags; |
- |
// FIXME: HTMLMediaElement has way too many state bits. |
bool m_lockedPendingUserGesture : 1; |
bool m_playing : 1; |
@@ -608,6 +607,8 @@ private: |
HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList; |
ExceptionCode m_playPromiseErrorCode; |
+ WeakPtrFactory<HTMLMediaElement> m_weakTaskFactory; |
+ |
// This is a weak reference, since m_audioSourceNode holds a reference to us. |
// TODO(Oilpan): Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem. |
GC_PLUGIN_IGNORE("http://crbug.com/404577") |