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 5c774d18b2084e949dc302288bedb5e6f34f3a69..7d4911c9ba09a966e826290e4a33b64ac047b271 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
@@ -478,12 +478,10 @@ private: |
void scheduleResolvePlayPromises(); |
void scheduleRejectPlayPromises(ExceptionCode); |
void scheduleNotifyPlaying(); |
- |
- void resolvePlayPromises(); |
- // TODO(mlamouri): this is used for cancellable tasks because we can't pass |
- // parameters. |
- void rejectPlayPromises(); |
+ void resolveScheduledPlayPromises(); |
+ void rejectScheduledPlayPromises(); |
void rejectPlayPromises(ExceptionCode, const String&); |
+ void rejectPlayPromisesInternal(ExceptionCode, const String&); |
EnumerationHistogram& showControlsHistogram() const; |
@@ -591,9 +589,11 @@ private: |
Member<CueTimeline> m_cueTimeline; |
- HeapVector<Member<ScriptPromiseResolver>> m_playResolvers; |
+ HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolvers; |
OwnPtr<CancellableTaskFactory> m_playPromiseResolveTask; |
OwnPtr<CancellableTaskFactory> m_playPromiseRejectTask; |
+ HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolveList; |
+ HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList; |
ExceptionCode m_playPromiseErrorCode; |
// This is a weak reference, since m_audioSourceNode holds a reference to us. |