<!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>[182081] trunk</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/182081">182081</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-03-27 14:32:38 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Safari fails to fire page "load" event with video[preload=none]
https://bugs.webkit.org/show_bug.cgi?id=143147
Reviewed by Simon Fraser.
Source/WebCore:
Test: media/video-page-load-preload-none.html
When told to load() when preload == None, set the networkState to Idle.
This causes HTMLMediaElement to set the shouldDelayLoadEvent flag to
false, and allows the page's 'load' event to fire.
Drive-by fix: add setNetworkState() and setReadyState() methods to
MediaPlayerPrivateAVFoundation, reducing a bunch of code duplication.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::load):
(WebCore::MediaPlayerPrivateAVFoundation::setNetworkState):
(WebCore::MediaPlayerPrivateAVFoundation::setReadyState):
(WebCore::MediaPlayerPrivateAVFoundation::updateStates):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
LayoutTests:
* media/video-page-load-preload-none-expected.txt: Added.
* media/video-page-load-preload-none.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideopageloadpreloadnoneexpectedtxt">trunk/LayoutTests/media/video-page-load-preload-none-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideopageloadpreloadnonehtml">trunk/LayoutTests/media/video-page-load-preload-none.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182080 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-27 21:10:06 UTC (rev 182080)
+++ trunk/LayoutTests/ChangeLog 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-27 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Safari fails to fire page "load" event with video[preload=none]
+ https://bugs.webkit.org/show_bug.cgi?id=143147
+
+ Reviewed by Simon Fraser.
+
+ * media/video-page-load-preload-none-expected.txt: Added.
+ * media/video-page-load-preload-none.html: Added.
+
</ins><span class="cx"> 2015-03-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct test results after r182012.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideopageloadpreloadnoneexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-page-load-preload-none-expected.txt (0 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-page-load-preload-none-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-page-load-preload-none-expected.txt 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+
+Test the document's load event is not delayed when a movie's preload attribute is "none".
+
+
+inline script
+EVENT(load)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideopageloadpreloadnonehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-page-load-preload-none.html (0 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-page-load-preload-none.html (rev 0)
+++ trunk/LayoutTests/media/video-page-load-preload-none.html 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>video-page-load-preload-none</title>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
+ <script>
+ var video;
+
+ </script>
+ </head>
+ <body>
+ <video id="video" preload="none" poster="content/counting.jpg"><source id="source"></video>
+
+ <p>Test the document's load event is not delayed when a movie's preload attribute is "none".</p>
+
+ <script>
+ consoleWrite("<br><b>inline script</b>");
+
+ video = document.getElementById('video');
+ source = document.getElementById('source');
+ source.src = findMediaFile("video", "content/test");
+
+ waitForEventAndFail('stalled');
+ waitForEventOn(window, 'load', endTest);
+ </script>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182080 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-27 21:10:06 UTC (rev 182080)
+++ trunk/Source/WebCore/ChangeLog 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-03-27 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Safari fails to fire page "load" event with video[preload=none]
+ https://bugs.webkit.org/show_bug.cgi?id=143147
+
+ Reviewed by Simon Fraser.
+
+ Test: media/video-page-load-preload-none.html
+
+ When told to load() when preload == None, set the networkState to Idle.
+ This causes HTMLMediaElement to set the shouldDelayLoadEvent flag to
+ false, and allows the page's 'load' event to fire.
+
+ Drive-by fix: add setNetworkState() and setReadyState() methods to
+ MediaPlayerPrivateAVFoundation, reducing a bunch of code duplication.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::load):
+ (WebCore::MediaPlayerPrivateAVFoundation::setNetworkState):
+ (WebCore::MediaPlayerPrivateAVFoundation::setReadyState):
+ (WebCore::MediaPlayerPrivateAVFoundation::updateStates):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+
</ins><span class="cx"> 2015-03-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Calling crypto.webkitSubtle.generateKey causes page memory to never be released
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (182080 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2015-03-27 21:10:06 UTC (rev 182080)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -167,14 +167,8 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundation::load(%p)", this);
</span><span class="cx">
</span><del>- if (m_networkState != MediaPlayer::Loading) {
- m_networkState = MediaPlayer::Loading;
- m_player->networkStateChanged();
- }
- if (m_readyState != MediaPlayer::HaveNothing) {
- m_readyState = MediaPlayer::HaveNothing;
- m_player->readyStateChanged();
- }
</del><ins>+ setNetworkState(m_preload == MediaPlayer::None ? MediaPlayer::Idle : MediaPlayer::Loading);
+ setReadyState(MediaPlayer::HaveNothing);
</ins><span class="cx">
</span><span class="cx"> m_assetURL = url;
</span><span class="cx">
</span><span class="lines">@@ -188,8 +182,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> void MediaPlayerPrivateAVFoundation::load(const String&, MediaSourcePrivateClient*)
</span><span class="cx"> {
</span><del>- m_networkState = MediaPlayer::FormatError;
- m_player->networkStateChanged();
</del><ins>+ setNetworkState(MediaPlayer::FormatError);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -356,6 +349,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundation::setNetworkState(MediaPlayer::NetworkState state)
+{
+ if (state == m_networkState)
+ return;
+
+ m_networkState = state;
+ m_player->networkStateChanged();
+}
+
+void MediaPlayerPrivateAVFoundation::setReadyState(MediaPlayer::ReadyState state)
+{
+ if (state == m_readyState)
+ return;
+
+ m_readyState = state;
+ m_player->readyStateChanged();
+}
+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundation::characteristicsChanged()
</span><span class="cx"> {
</span><span class="cx"> if (m_delayCharacteristicsChangedNotification) {
</span><span class="lines">@@ -478,11 +489,11 @@
</span><span class="cx"> if (m_ignoreLoadStateChanges)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- MediaPlayer::NetworkState oldNetworkState = m_networkState;
- MediaPlayer::ReadyState oldReadyState = m_readyState;
</del><ins>+ MediaPlayer::NetworkState newNetworkState = m_networkState;
+ MediaPlayer::ReadyState newReadyState = m_readyState;
</ins><span class="cx">
</span><span class="cx"> if (m_loadingMetadata)
</span><del>- m_networkState = MediaPlayer::Loading;
</del><ins>+ newNetworkState = MediaPlayer::Loading;
</ins><span class="cx"> else {
</span><span class="cx"> // -loadValuesAsynchronouslyForKeys:completionHandler: has invoked its handler; test status of keys and determine state.
</span><span class="cx"> AssetStatus assetStatus = this->assetStatus();
</span><span class="lines">@@ -492,20 +503,20 @@
</span><span class="cx"> if (m_readyState < MediaPlayer::HaveMetadata && assetStatus > MediaPlayerAVAssetStatusLoading) {
</span><span class="cx"> if (m_assetIsPlayable) {
</span><span class="cx"> if (assetStatus >= MediaPlayerAVAssetStatusLoaded)
</span><del>- m_readyState = MediaPlayer::HaveMetadata;
</del><ins>+ newReadyState = MediaPlayer::HaveMetadata;
</ins><span class="cx"> if (itemStatus <= MediaPlayerAVPlayerItemStatusUnknown) {
</span><span class="cx"> if (assetStatus == MediaPlayerAVAssetStatusFailed || m_preload > MediaPlayer::MetaData || isLiveStream()) {
</span><span class="cx"> // The asset is playable but doesn't support inspection prior to playback (eg. streaming files),
</span><span class="cx"> // or we are supposed to prepare for playback immediately, so create the player item now.
</span><del>- m_networkState = MediaPlayer::Loading;
</del><ins>+ newNetworkState = MediaPlayer::Loading;
</ins><span class="cx"> prepareToPlay();
</span><span class="cx"> } else
</span><del>- m_networkState = MediaPlayer::Idle;
</del><ins>+ newNetworkState = MediaPlayer::Idle;
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // FIX ME: fetch the error associated with the @"playable" key to distinguish between format
</span><span class="cx"> // and network errors.
</span><del>- m_networkState = MediaPlayer::FormatError;
</del><ins>+ newNetworkState = MediaPlayer::FormatError;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -521,25 +532,25 @@
</span><span class="cx"> // If the status becomes PlaybackBufferFull, loading stops and the status will not
</span><span class="cx"> // progress to LikelyToKeepUp. Set the readyState to HAVE_ENOUGH_DATA, on the
</span><span class="cx"> // presumption that if the playback buffer is full, playback will probably not stall.
</span><del>- m_readyState = MediaPlayer::HaveEnoughData;
</del><ins>+ newReadyState = MediaPlayer::HaveEnoughData;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case MediaPlayerAVPlayerItemStatusReadyToPlay:
</span><span class="cx"> if (m_readyState != MediaPlayer::HaveEnoughData && maxTimeLoaded() > currentMediaTime())
</span><del>- m_readyState = MediaPlayer::HaveFutureData;
</del><ins>+ newReadyState = MediaPlayer::HaveFutureData;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case MediaPlayerAVPlayerItemStatusPlaybackBufferEmpty:
</span><del>- m_readyState = MediaPlayer::HaveCurrentData;
</del><ins>+ newReadyState = MediaPlayer::HaveCurrentData;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (itemStatus == MediaPlayerAVPlayerItemStatusPlaybackBufferFull)
</span><del>- m_networkState = MediaPlayer::Idle;
</del><ins>+ newNetworkState = MediaPlayer::Idle;
</ins><span class="cx"> else if (itemStatus == MediaPlayerAVPlayerItemStatusFailed)
</span><del>- m_networkState = MediaPlayer::DecodeError;
</del><ins>+ newNetworkState = MediaPlayer::DecodeError;
</ins><span class="cx"> else if (itemStatus != MediaPlayerAVPlayerItemStatusPlaybackBufferFull && itemStatus >= MediaPlayerAVPlayerItemStatusReadyToPlay)
</span><del>- m_networkState = (maxTimeLoaded() == durationMediaTime()) ? MediaPlayer::Loaded : MediaPlayer::Loading;
</del><ins>+ newNetworkState = (maxTimeLoaded() == durationMediaTime()) ? MediaPlayer::Loaded : MediaPlayer::Loading;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -548,28 +559,25 @@
</span><span class="cx">
</span><span class="cx"> if (!m_haveReportedFirstVideoFrame && m_cachedHasVideo && hasAvailableVideoFrame()) {
</span><span class="cx"> if (m_readyState < MediaPlayer::HaveCurrentData)
</span><del>- m_readyState = MediaPlayer::HaveCurrentData;
</del><ins>+ newReadyState = MediaPlayer::HaveCurrentData;
</ins><span class="cx"> m_haveReportedFirstVideoFrame = true;
</span><span class="cx"> m_player->firstVideoFrameAvailable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_networkState != oldNetworkState)
- m_player->networkStateChanged();
</del><ins>+#if !LOG_DISABLED
+ if (m_networkState != newNetworkState || m_readyState != newReadyState) {
+ LOG(Media, "MediaPlayerPrivateAVFoundation::updateStates(%p) - entered with networkState = %i, readyState = %i, exiting with networkState = %i, readyState = %i",
+ this, static_cast<int>(m_networkState), static_cast<int>(m_readyState), static_cast<int>(newNetworkState), static_cast<int>(newReadyState));
+ }
+#endif
</ins><span class="cx">
</span><del>- if (m_readyState != oldReadyState)
- m_player->readyStateChanged();
</del><ins>+ setNetworkState(newNetworkState);
+ setReadyState(newReadyState);
</ins><span class="cx">
</span><span class="cx"> if (m_playWhenFramesAvailable && hasAvailableVideoFrame()) {
</span><span class="cx"> m_playWhenFramesAvailable = false;
</span><span class="cx"> platformPlay();
</span><span class="cx"> }
</span><del>-
-#if !LOG_DISABLED
- if (m_networkState != oldNetworkState || oldReadyState != m_readyState) {
- LOG(Media, "MediaPlayerPrivateAVFoundation::updateStates(%p) - entered with networkState = %i, readyState = %i, exiting with networkState = %i, readyState = %i",
- this, static_cast<int>(oldNetworkState), static_cast<int>(oldReadyState), static_cast<int>(m_networkState), static_cast<int>(m_readyState));
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundation::setSize(const IntSize&)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (182080 => 182081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-03-27 21:10:06 UTC (rev 182080)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-03-27 21:32:38 UTC (rev 182081)
</span><span class="lines">@@ -270,6 +270,8 @@
</span><span class="cx"> void setIgnoreLoadStateChanges(bool delay) { m_ignoreLoadStateChanges = delay; }
</span><span class="cx"> void setNaturalSize(FloatSize);
</span><span class="cx"> bool isLiveStream() const { return std::isinf(duration()); }
</span><ins>+ void setNetworkState(MediaPlayer::NetworkState);
+ void setReadyState(MediaPlayer::ReadyState);
</ins><span class="cx">
</span><span class="cx"> enum MediaRenderingMode { MediaRenderingNone, MediaRenderingToContext, MediaRenderingToLayer };
</span><span class="cx"> MediaRenderingMode currentRenderingMode() const;
</span></span></pre>
</div>
</div>
</body>
</html>