<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202749] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202749">202749</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-07-01 13:31:18 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLMediaElement::resume() may cause JavaScript execution
https://bugs.webkit.org/show_bug.cgi?id=159327
<rdar://problem/27131641>
Reviewed by Jer Noble.
HTMLMediaElement::updatePlayState can cause an element to begin playing and enter fullscreen,
which can result in a call to the media controls and JavaScript execution. Javascript is not
allowed allowed to run when a page resumes, so make the call to updatePlayState asynchronous.
No new tests, I wasn't able to create a test that triggers the crash.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::scheduleDelayedAction): Support UpdatePlayState.
(WebCore::HTMLMediaElement::pendingActionTimerFired): Ditto.
(WebCore::HTMLMediaElement::setReadyState): UpdateMediaState -> UpdateState.
(WebCore::HTMLMediaElement::playInternal): Don't call updateMediaController, it is called
by updatePlayState.
(WebCore::HTMLMediaElement::setMuted): UpdateMediaState -> UpdateState.
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Ditto.
(WebCore::HTMLMediaElement::mediaEngineWasUpdated): Update media state asynchronously.
(WebCore::HTMLMediaElement::updatePlayState): Add parameter to allow update to happen
asynchronously.
(WebCore::HTMLMediaElement::setPlaying): UpdateMediaState -> UpdateState.
(WebCore::HTMLMediaElement::setPausedInternal): Update media state asynchronously.
(WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
UpdateMediaState -> UpdateState.
(WebCore::HTMLMediaElement::removeEventListener): Ditto.
(WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent): Ditto.
(WebCore::HTMLMediaElement::updateMediaState): UpdateMediaState -> UpdateState
* html/HTMLMediaElement.h:
* html/HTMLMediaElementEnums.h: Add UpdatePlayState.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementEnumsh">trunk/Source/WebCore/html/HTMLMediaElementEnums.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202748 => 202749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-01 19:41:30 UTC (rev 202748)
+++ trunk/Source/WebCore/ChangeLog 2016-07-01 20:31:18 UTC (rev 202749)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-07-01 Eric Carlson <eric.carlson@apple.com>
+
+ HTMLMediaElement::resume() may cause JavaScript execution
+ https://bugs.webkit.org/show_bug.cgi?id=159327
+ <rdar://problem/27131641>
+
+ Reviewed by Jer Noble.
+
+ HTMLMediaElement::updatePlayState can cause an element to begin playing and enter fullscreen,
+ which can result in a call to the media controls and JavaScript execution. Javascript is not
+ allowed allowed to run when a page resumes, so make the call to updatePlayState asynchronous.
+
+ No new tests, I wasn't able to create a test that triggers the crash.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::scheduleDelayedAction): Support UpdatePlayState.
+ (WebCore::HTMLMediaElement::pendingActionTimerFired): Ditto.
+ (WebCore::HTMLMediaElement::setReadyState): UpdateMediaState -> UpdateState.
+ (WebCore::HTMLMediaElement::playInternal): Don't call updateMediaController, it is called
+ by updatePlayState.
+ (WebCore::HTMLMediaElement::setMuted): UpdateMediaState -> UpdateState.
+ (WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Ditto.
+ (WebCore::HTMLMediaElement::mediaEngineWasUpdated): Update media state asynchronously.
+ (WebCore::HTMLMediaElement::updatePlayState): Add parameter to allow update to happen
+ asynchronously.
+ (WebCore::HTMLMediaElement::setPlaying): UpdateMediaState -> UpdateState.
+ (WebCore::HTMLMediaElement::setPausedInternal): Update media state asynchronously.
+ (WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
+ UpdateMediaState -> UpdateState.
+ (WebCore::HTMLMediaElement::removeEventListener): Ditto.
+ (WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent): Ditto.
+ (WebCore::HTMLMediaElement::updateMediaState): UpdateMediaState -> UpdateState
+ * html/HTMLMediaElement.h:
+ * html/HTMLMediaElementEnums.h: Add UpdatePlayState.
+
</ins><span class="cx"> 2016-07-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Blob content type not preserved when retrieving blobs from IndexedDB.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (202748 => 202749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-01 19:41:30 UTC (rev 202748)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-01 20:31:18 UTC (rev 202749)
</span><span class="lines">@@ -892,6 +892,9 @@
</span><span class="cx"> if (actionType & MediaEngineUpdated)
</span><span class="cx"> setFlags(m_pendingActionFlags, MediaEngineUpdated);
</span><span class="cx">
</span><ins>+ if (actionType & UpdatePlayState)
+ setFlags(m_pendingActionFlags, UpdatePlayState);
+
</ins><span class="cx"> m_pendingActionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -979,6 +982,9 @@
</span><span class="cx">
</span><span class="cx"> if (pendingActions & MediaEngineUpdated)
</span><span class="cx"> mediaEngineWasUpdated();
</span><ins>+
+ if (pendingActions & UpdatePlayState)
+ updatePlayState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaError* HTMLMediaElement::error() const
</span><span class="lines">@@ -2269,7 +2275,7 @@
</span><span class="cx"> logMediaLoadRequest(document().page(), m_player->engineDescription(), String(), true);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_mediaSession->clientCharacteristicsChanged();
</span><span class="lines">@@ -3126,7 +3132,7 @@
</span><span class="cx">
</span><span class="cx"> m_autoplaying = false;
</span><span class="cx"> updatePlayState();
</span><del>- updateMediaController();
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3358,7 +3364,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4418,7 +4424,7 @@
</span><span class="cx"> m_sentEndEvent = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updatePlayState();
</del><ins>+ updatePlayState(UpdateState::Asynchronously);
</ins><span class="cx"> endProcessingMediaPlayerCallback();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4594,7 +4600,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4828,8 +4834,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::updatePlayState()
</del><ins>+void HTMLMediaElement::updatePlayState(UpdateState updateState)
</ins><span class="cx"> {
</span><ins>+ if (updateState == UpdateState::Asynchronously) {
+ scheduleDelayedAction(UpdatePlayState);
+ return;
+ }
+
</ins><span class="cx"> if (!m_player)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -4922,7 +4933,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4929,7 +4940,7 @@
</span><span class="cx"> void HTMLMediaElement::setPausedInternal(bool b)
</span><span class="cx"> {
</span><span class="cx"> m_pausedInternal = b;
</span><del>- updatePlayState();
</del><ins>+ updatePlayState(UpdateState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::stopPeriodicTimers()
</span><span class="lines">@@ -5221,7 +5232,7 @@
</span><span class="cx"> m_mediaSession->isPlayingToWirelessPlaybackTargetChanged(m_isPlayingToWirelessTarget);
</span><span class="cx"> if (m_isPlayingToWirelessTarget)
</span><span class="cx"> m_mediaSession->setCanProduceAudio(true);
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::dispatchEvent(Event& event)
</span><span class="lines">@@ -5266,7 +5277,7 @@
</span><span class="cx"> if (didRemoveLastAvailabilityChangedListener) {
</span><span class="cx"> m_hasPlaybackTargetAvailabilityListeners = false;
</span><span class="cx"> m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, false);
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -5279,7 +5290,7 @@
</span><span class="cx"> auto event = WebKitPlaybackTargetAvailabilityEvent::create(eventNames().webkitplaybacktargetavailabilitychangedEvent, hasTargets);
</span><span class="cx"> event->setTarget(this);
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(WTFMove(event));
</span><del>- updateMediaState(UpdateMediaState::Asynchronously);
</del><ins>+ updateMediaState(UpdateState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</span><span class="lines">@@ -6844,9 +6855,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-void HTMLMediaElement::updateMediaState(UpdateMediaState updateState)
</del><ins>+void HTMLMediaElement::updateMediaState(UpdateState updateState)
</ins><span class="cx"> {
</span><del>- if (updateState == UpdateMediaState::Asynchronously) {
</del><ins>+ if (updateState == UpdateState::Asynchronously) {
</ins><span class="cx"> scheduleDelayedAction(CheckMediaState);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (202748 => 202749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-07-01 19:41:30 UTC (rev 202748)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-07-01 20:31:18 UTC (rev 202749)
</span><span class="lines">@@ -690,8 +690,10 @@
</span><span class="cx"> void beginProcessingMediaPlayerCallback() { ++m_processingMediaPlayerCallback; }
</span><span class="cx"> void endProcessingMediaPlayerCallback() { ASSERT(m_processingMediaPlayerCallback); --m_processingMediaPlayerCallback; }
</span><span class="cx">
</span><ins>+ enum class UpdateState { Asynchronously, Synchronously };
+
+ void updatePlayState(UpdateState updateState = UpdateState::Synchronously);
</ins><span class="cx"> void updateVolume();
</span><del>- void updatePlayState();
</del><span class="cx"> void setPlaying(bool);
</span><span class="cx"> bool potentiallyPlaying() const;
</span><span class="cx"> bool endedPlayback() const;
</span><span class="lines">@@ -770,8 +772,7 @@
</span><span class="cx"> void prepareForDocumentSuspension() final;
</span><span class="cx"> void resumeFromDocumentSuspension() final;
</span><span class="cx">
</span><del>- enum class UpdateMediaState { Asynchronously, Synchronously };
- void updateMediaState(UpdateMediaState updateState = UpdateMediaState::Synchronously);
</del><ins>+ void updateMediaState(UpdateState updateState = UpdateState::Synchronously);
</ins><span class="cx"> bool hasPlaybackTargetAvailabilityListeners() const { return m_hasPlaybackTargetAvailabilityListeners; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementEnumsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElementEnums.h (202748 => 202749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElementEnums.h 2016-07-01 19:41:30 UTC (rev 202748)
+++ trunk/Source/WebCore/html/HTMLMediaElementEnums.h 2016-07-01 20:31:18 UTC (rev 202749)
</span><span class="lines">@@ -42,8 +42,9 @@
</span><span class="cx"> CheckPlaybackTargetCompatablity = 1 << 4,
</span><span class="cx"> CheckMediaState = 1 << 5,
</span><span class="cx"> MediaEngineUpdated = 1 << 6,
</span><ins>+ UpdatePlayState = 1 << 7,
</ins><span class="cx">
</span><del>- EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity | CheckMediaState,
</del><ins>+ EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity | CheckMediaState | UpdatePlayState,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
</span></span></pre>
</div>
</div>
</body>
</html>