Title: [233996] branches/safari-606-branch/Source/WebCore
- Revision
- 233996
- Author
- [email protected]
- Date
- 2018-07-19 12:21:26 -0700 (Thu, 19 Jul 2018)
Log Message
Revert r233982. rdar://problem/42389208
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (233995 => 233996)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-19 19:06:36 UTC (rev 233995)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-19 19:21:26 UTC (rev 233996)
@@ -1,5 +1,9 @@
2018-07-19 Babak Shafiei <[email protected]>
+ Revert r233982. rdar://problem/42389208
+
+2018-07-19 Babak Shafiei <[email protected]>
+
Cherry-pick r233982. rdar://problem/42389208
Hitting RELEASE_ASSERT(!m_activeDOMObjectAdditionForbidden) under HTMLMediaElement::resume()
Modified: branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp (233995 => 233996)
--- branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-19 19:06:36 UTC (rev 233995)
+++ branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-19 19:21:26 UTC (rev 233996)
@@ -678,7 +678,6 @@
#endif
m_seekTaskQueue.close();
- m_resumeTaskQueue.close();
m_promiseTaskQueue.close();
m_pauseAfterDetachedTaskQueue.close();
m_playbackControlsManagerBehaviorRestrictionsQueue.close();
@@ -5584,7 +5583,6 @@
void HTMLMediaElement::contextDestroyed()
{
m_seekTaskQueue.close();
- m_resumeTaskQueue.close();
m_shadowDOMTaskQueue.close();
m_promiseTaskQueue.close();
m_pauseAfterDetachedTaskQueue.close();
@@ -5607,7 +5605,6 @@
m_asyncEventQueue.close();
m_promiseTaskQueue.close();
m_resourceSelectionTaskQueue.close();
- m_resumeTaskQueue.cancelAllTasks();
// Once an active DOM object has been stopped it can not be restarted, so we can deallocate
// the media player now. Note that userCancelledLoad will already called clearMediaPlayer
@@ -5623,8 +5620,6 @@
INFO_LOG(LOGIDENTIFIER);
Ref<HTMLMediaElement> protectedThis(*this);
- m_resumeTaskQueue.cancelAllTasks();
-
switch (reason) {
case ReasonForSuspension::PageCache:
stopWithoutDestroyingMediaPlayer();
@@ -5667,13 +5662,13 @@
m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequirePageConsentToResumeMedia);
- if (m_error && m_error->code() == MediaError::MEDIA_ERR_ABORTED && !m_resumeTaskQueue.hasPendingTasks()) {
+ if (m_error && m_error->code() == MediaError::MEDIA_ERR_ABORTED) {
// Restart the load if it was aborted in the middle by moving the document to the page cache.
// m_error is only left at MEDIA_ERR_ABORTED when the document becomes inactive (it is set to
// MEDIA_ERR_ABORTED while the abortEvent is being sent, but cleared immediately afterwards).
// This behavior is not specified but it seems like a sensible thing to do.
// As it is not safe to immedately start loading now, let's schedule a load.
- m_resumeTaskQueue.enqueueTask(std::bind(&HTMLMediaElement::prepareForLoad, this));
+ prepareForLoad();
}
updateRenderer();
Modified: branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.h (233995 => 233996)
--- branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.h 2018-07-19 19:06:36 UTC (rev 233995)
+++ branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.h 2018-07-19 19:21:26 UTC (rev 233996)
@@ -929,7 +929,6 @@
Timer m_scanTimer;
Timer m_playbackControlsManagerBehaviorRestrictionsTimer;
Timer m_seekToPlaybackPositionEndedTimer;
- GenericTaskQueue<Timer> m_resumeTaskQueue;
GenericTaskQueue<Timer> m_seekTaskQueue;
GenericTaskQueue<Timer> m_shadowDOMTaskQueue;
GenericTaskQueue<Timer> m_promiseTaskQueue;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
