Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (200757 => 200758)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-05-12 09:12:18 UTC (rev 200757)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-05-12 09:12:22 UTC (rev 200758)
@@ -1,5 +1,47 @@
2016-05-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r198780. rdar://problem/26228892
+
+ 2016-03-29 Eric Carlson <eric.carl...@apple.com>
+
+ media/track/track-remove-track.html is flaky, crashing and failing
+ https://bugs.webkit.org/show_bug.cgi?id=130971
+
+ Reviewed by Alexey Proskuryakov.
+
+ Prevent HTMLMediaElement from being collected while it is creating media controls.
+ These changes prevent the test from crashing but they do not fix the flakiness,
+ which is caused by another bug. Fixing that is tracked by
+ https://bugs.webkit.org/show_bug.cgi?id=155956.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::actionName): New, debugging-only helper function.
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize new variables.
+ (WebCore::HTMLMediaElement::scheduleDelayedAction): Log the flag names to make debugging easier.
+ (WebCore::HTMLMediaElement::scheduleNextSourceChild): Add logging.
+ (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Update logging.
+ (WebCore::HTMLMediaElement::configureTextTrackGroup): Drive-by optimization: don't call
+ updateCaptionContainer here, call it before exiting configureTextTracks so we only call
+ it once instead of once per track group.
+ (WebCore::controllerJSValue):
+ (WebCore::HTMLMediaElement::ensureMediaControlsShadowRoot): New, wrapper around calling
+ ensureUserAgentShadowRoot so m_creatingControls can be set and cleared appropriately.
+ (WebCore::HTMLMediaElement::updateCaptionContainer): ensureUserAgentShadowRoot ->
+ ensureMediaControlsShadowRoot. Drive by optimization: set/test m_haveSetupCaptionContainer
+ so we only do this setup once.
+ (WebCore::HTMLMediaElement::configureTextTracks): Call updateCaptionContainer.
+ (WebCore::HTMLMediaElement::clearMediaPlayer): Log flag names.
+ (WebCore::HTMLMediaElement::hasPendingActivity): Return true when creating controls so GC
+ won't happen during controls setup.
+ (WebCore::HTMLMediaElement::updateTextTrackDisplay): ensureUserAgentShadowRoot ->
+ ensureMediaControlsShadowRoot.
+ (WebCore::HTMLMediaElement::createMediaControls): Ditto.
+ (WebCore::HTMLMediaElement::configureMediaControls): Ditto.
+ (WebCore::HTMLMediaElement::configureTextTrackDisplay): Ditto.
+ * html/HTMLMediaElement.h:
+
+2016-05-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200738. rdar://problem/26228887
2016-05-11 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp (200757 => 200758)
--- branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-12 09:12:18 UTC (rev 200757)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-12 09:12:22 UTC (rev 200758)
@@ -178,6 +178,30 @@
{
return val ? "true" : "false";
}
+
+static String actionName(HTMLMediaElementEnums::DelayedActionType action)
+{
+ StringBuilder actionBuilder;
+
+#define CASE(_actionType) \
+ if (action & (HTMLMediaElementEnums::_actionType)) { \
+ if (!actionBuilder.isEmpty()) \
+ actionBuilder.append(", "); \
+ actionBuilder.append(#_actionType); \
+ } \
+
+ CASE(LoadMediaResource);
+ CASE(ConfigureTextTracks);
+ CASE(TextTrackChangesNotification);
+ CASE(ConfigureTextTrackDisplay);
+ CASE(CheckPlaybackTargetCompatablity);
+ CASE(CheckMediaState);
+
+ return actionBuilder.toString();
+
+#undef CASE
+}
+
#endif
#ifndef LOG_MEDIA_EVENTS
@@ -351,8 +375,10 @@
, m_havePreparedToPlay(false)
, m_parsingInProgress(createdByParser)
, m_elementIsHidden(document.hidden())
+ , m_creatingControls(false)
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
, m_mediaControlsDependOnPageScaleFactor(false)
+ , m_haveSetUpCaptionContainer(false)
#endif
#if ENABLE(VIDEO_TRACK)
, m_tracksAreReady(true)
@@ -761,7 +787,7 @@
void HTMLMediaElement::scheduleDelayedAction(DelayedActionType actionType)
{
- LOG(Media, "HTMLMediaElement::scheduleLoad(%p)", this);
+ LOG(Media, "HTMLMediaElement::scheduleDelayedAction(%p) - setting %s flag", this, actionName(actionType).utf8().data());
if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaResource)) {
prepareForLoad();
@@ -792,6 +818,7 @@
void HTMLMediaElement::scheduleNextSourceChild()
{
// Schedule the timer to try the next <source> element WITHOUT resetting state ala prepareForLoad.
+ LOG(Media, "HTMLMediaElement::scheduleNextSourceChild(%p) - setting %s flag", this, actionName(LoadMediaResource).utf8().data());
setFlags(m_pendingActionFlags, LoadMediaResource);
m_pendingActionTimer.startOneShot(0);
}
@@ -1348,7 +1375,7 @@
if (ignoreTrackDisplayUpdateRequests())
return;
- LOG(Media, "HTMLMediaElement::updateActiveTextTracks(%p)", this);
+ LOG(Media, "HTMLMediaElement::updateActiveTextTrackCues(%p)", this);
// 1 - Let current cues be a list of cues, initialized to contain all the
// cues of all the hidden, showing, or showing by default text tracks of the
@@ -3822,8 +3849,6 @@
m_webkitLegacyClosedCaptionOverride = true;
}
- updateCaptionContainer();
-
m_processingPreferenceChange = false;
}
@@ -3852,11 +3877,22 @@
return controllerJSWrapper;
}
-
+
+void HTMLMediaElement::ensureMediaControlsShadowRoot()
+{
+ ASSERT(!m_creatingControls);
+ m_creatingControls = true;
+ ensureUserAgentShadowRoot();
+ m_creatingControls = false;
+}
+
void HTMLMediaElement::updateCaptionContainer()
{
LOG(Media, "HTMLMediaElement::updateCaptionContainer(%p)", this);
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ if (m_haveSetUpCaptionContainer)
+ return;
+
Page* page = document().page();
if (!page)
return;
@@ -3866,7 +3902,7 @@
if (!ensureMediaControlsInjectedScript())
return;
- ensureUserAgentShadowRoot();
+ ensureMediaControlsShadowRoot();
if (!m_mediaControlsHost)
m_mediaControlsHost = MediaControlsHost::create(this);
@@ -3900,6 +3936,8 @@
JSC::MarkedArgumentBuffer noArguments;
JSC::call(exec, methodObject, callType, callData, controllerObject, noArguments);
exec->clearException();
+
+ m_haveSetUpCaptionContainer = true;
#endif
}
@@ -4014,6 +4052,7 @@
if (otherTracks.tracks.size())
configureTextTrackGroup(otherTracks);
+ updateCaptionContainer();
configureTextTrackDisplay();
if (hasMediaControls())
mediaControls()->closedCaptionTracksChanged();
@@ -4849,9 +4888,9 @@
#endif
}
-void HTMLMediaElement::clearMediaPlayer(int flags)
+void HTMLMediaElement::clearMediaPlayer(DelayedActionType flags)
{
- LOG(Media, "HTMLMediaElement::clearMediaPlayer(%p) - flags = %x", this, (unsigned)flags);
+ LOG(Media, "HTMLMediaElement::clearMediaPlayer(%p) - flags = %s", this, actionName(flags).utf8().data());
#if USE(PLATFORM_TEXT_TRACK_MENU)
if (platformTextTrackMenu()) {
@@ -5006,7 +5045,7 @@
bool HTMLMediaElement::hasPendingActivity() const
{
- return (hasAudio() && isPlaying()) || m_asyncEventQueue.hasPendingEvents();
+ return (hasAudio() && isPlaying()) || m_asyncEventQueue.hasPendingEvents() || m_creatingControls;
}
void HTMLMediaElement::mediaVolumeDidChange()
@@ -5342,7 +5381,7 @@
void HTMLMediaElement::updateTextTrackDisplay()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- ensureUserAgentShadowRoot();
+ ensureMediaControlsShadowRoot();
ASSERT(m_mediaControlsHost);
m_mediaControlsHost->updateTextTrackContainer();
#else
@@ -5502,7 +5541,7 @@
bool HTMLMediaElement::createMediaControls()
{
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- ensureUserAgentShadowRoot();
+ ensureMediaControlsShadowRoot();
return false;
#else
if (hasMediaControls())
@@ -5547,7 +5586,7 @@
if (!requireControls || !inDocument() || !inActiveDocument())
return;
- ensureUserAgentShadowRoot();
+ ensureMediaControlsShadowRoot();
#else
if (!requireControls || !inDocument() || !inActiveDocument()) {
if (hasMediaControls())
@@ -5593,7 +5632,7 @@
if (!m_haveVisibleTextTrack)
return;
- ensureUserAgentShadowRoot();
+ ensureMediaControlsShadowRoot();
#else
if (!m_haveVisibleTextTrack && !hasMediaControls())
return;
Modified: branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.h (200757 => 200758)
--- branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.h 2016-05-12 09:12:18 UTC (rev 200757)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/HTMLMediaElement.h 2016-05-12 09:12:22 UTC (rev 200758)
@@ -631,7 +631,7 @@
void scheduleNextSourceChild();
void loadNextSourceChild();
void userCancelledLoad();
- void clearMediaPlayer(int flags);
+ void clearMediaPlayer(DelayedActionType flags);
bool havePotentialSourceChild();
void noneSupported();
void cancelPendingEventsAndCallbacks();
@@ -735,6 +735,7 @@
void unregisterWithDocument(Document&);
void updateCaptionContainer();
+ void ensureMediaControlsShadowRoot();
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
virtual void documentWillSuspendForPageCache() override final;
@@ -879,9 +880,11 @@
bool m_havePreparedToPlay : 1;
bool m_parsingInProgress : 1;
bool m_elementIsHidden : 1;
+ bool m_creatingControls : 1;
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
bool m_mediaControlsDependOnPageScaleFactor : 1;
+ bool m_haveSetUpCaptionContainer : 1;
#endif
#if ENABLE(VIDEO_TRACK)
