Modified: trunk/LayoutTests/ChangeLog (182080 => 182081)
--- trunk/LayoutTests/ChangeLog 2015-03-27 21:10:06 UTC (rev 182080)
+++ trunk/LayoutTests/ChangeLog 2015-03-27 21:32:38 UTC (rev 182081)
@@ -1,3 +1,13 @@
+2015-03-27 Jer Noble <[email protected]>
+
+ [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.
+
2015-03-27 Brent Fulgham <[email protected]>
Correct test results after r182012.
Added: trunk/LayoutTests/media/video-page-load-preload-none-expected.txt (0 => 182081)
--- 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)
@@ -0,0 +1,8 @@
+
+Test the document's load event is not delayed when a movie's preload attribute is "none".
+
+
+inline script
+EVENT(load)
+END OF TEST
+
Added: trunk/LayoutTests/media/video-page-load-preload-none.html (0 => 182081)
--- 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)
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+ <head>
+ <title>video-page-load-preload-none</title>
+ <script src=""
+ <script src=""
+ <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 = "" "content/test");
+
+ waitForEventAndFail('stalled');
+ waitForEventOn(window, 'load', endTest);
+ </script>
+
+ </body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (182080 => 182081)
--- 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)
@@ -1,3 +1,26 @@
+2015-03-27 Jer Noble <[email protected]>
+
+ [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:
+
2015-03-27 Alexey Proskuryakov <[email protected]>
Calling crypto.webkitSubtle.generateKey causes page memory to never be released
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (182080 => 182081)
--- 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)
@@ -167,14 +167,8 @@
{
LOG(Media, "MediaPlayerPrivateAVFoundation::load(%p)", this);
- if (m_networkState != MediaPlayer::Loading) {
- m_networkState = MediaPlayer::Loading;
- m_player->networkStateChanged();
- }
- if (m_readyState != MediaPlayer::HaveNothing) {
- m_readyState = MediaPlayer::HaveNothing;
- m_player->readyStateChanged();
- }
+ setNetworkState(m_preload == MediaPlayer::None ? MediaPlayer::Idle : MediaPlayer::Loading);
+ setReadyState(MediaPlayer::HaveNothing);
m_assetURL = url;
@@ -188,8 +182,7 @@
#if ENABLE(MEDIA_SOURCE)
void MediaPlayerPrivateAVFoundation::load(const String&, MediaSourcePrivateClient*)
{
- m_networkState = MediaPlayer::FormatError;
- m_player->networkStateChanged();
+ setNetworkState(MediaPlayer::FormatError);
}
#endif
@@ -356,6 +349,24 @@
}
}
+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();
+}
+
void MediaPlayerPrivateAVFoundation::characteristicsChanged()
{
if (m_delayCharacteristicsChangedNotification) {
@@ -478,11 +489,11 @@
if (m_ignoreLoadStateChanges)
return;
- MediaPlayer::NetworkState oldNetworkState = m_networkState;
- MediaPlayer::ReadyState oldReadyState = m_readyState;
+ MediaPlayer::NetworkState newNetworkState = m_networkState;
+ MediaPlayer::ReadyState newReadyState = m_readyState;
if (m_loadingMetadata)
- m_networkState = MediaPlayer::Loading;
+ newNetworkState = MediaPlayer::Loading;
else {
// -loadValuesAsynchronouslyForKeys:completionHandler: has invoked its handler; test status of keys and determine state.
AssetStatus assetStatus = this->assetStatus();
@@ -492,20 +503,20 @@
if (m_readyState < MediaPlayer::HaveMetadata && assetStatus > MediaPlayerAVAssetStatusLoading) {
if (m_assetIsPlayable) {
if (assetStatus >= MediaPlayerAVAssetStatusLoaded)
- m_readyState = MediaPlayer::HaveMetadata;
+ newReadyState = MediaPlayer::HaveMetadata;
if (itemStatus <= MediaPlayerAVPlayerItemStatusUnknown) {
if (assetStatus == MediaPlayerAVAssetStatusFailed || m_preload > MediaPlayer::MetaData || isLiveStream()) {
// The asset is playable but doesn't support inspection prior to playback (eg. streaming files),
// or we are supposed to prepare for playback immediately, so create the player item now.
- m_networkState = MediaPlayer::Loading;
+ newNetworkState = MediaPlayer::Loading;
prepareToPlay();
} else
- m_networkState = MediaPlayer::Idle;
+ newNetworkState = MediaPlayer::Idle;
}
} else {
// FIX ME: fetch the error associated with the @"playable" key to distinguish between format
// and network errors.
- m_networkState = MediaPlayer::FormatError;
+ newNetworkState = MediaPlayer::FormatError;
}
}
@@ -521,25 +532,25 @@
// If the status becomes PlaybackBufferFull, loading stops and the status will not
// progress to LikelyToKeepUp. Set the readyState to HAVE_ENOUGH_DATA, on the
// presumption that if the playback buffer is full, playback will probably not stall.
- m_readyState = MediaPlayer::HaveEnoughData;
+ newReadyState = MediaPlayer::HaveEnoughData;
break;
case MediaPlayerAVPlayerItemStatusReadyToPlay:
if (m_readyState != MediaPlayer::HaveEnoughData && maxTimeLoaded() > currentMediaTime())
- m_readyState = MediaPlayer::HaveFutureData;
+ newReadyState = MediaPlayer::HaveFutureData;
break;
case MediaPlayerAVPlayerItemStatusPlaybackBufferEmpty:
- m_readyState = MediaPlayer::HaveCurrentData;
+ newReadyState = MediaPlayer::HaveCurrentData;
break;
}
if (itemStatus == MediaPlayerAVPlayerItemStatusPlaybackBufferFull)
- m_networkState = MediaPlayer::Idle;
+ newNetworkState = MediaPlayer::Idle;
else if (itemStatus == MediaPlayerAVPlayerItemStatusFailed)
- m_networkState = MediaPlayer::DecodeError;
+ newNetworkState = MediaPlayer::DecodeError;
else if (itemStatus != MediaPlayerAVPlayerItemStatusPlaybackBufferFull && itemStatus >= MediaPlayerAVPlayerItemStatusReadyToPlay)
- m_networkState = (maxTimeLoaded() == durationMediaTime()) ? MediaPlayer::Loaded : MediaPlayer::Loading;
+ newNetworkState = (maxTimeLoaded() == durationMediaTime()) ? MediaPlayer::Loaded : MediaPlayer::Loading;
}
}
@@ -548,28 +559,25 @@
if (!m_haveReportedFirstVideoFrame && m_cachedHasVideo && hasAvailableVideoFrame()) {
if (m_readyState < MediaPlayer::HaveCurrentData)
- m_readyState = MediaPlayer::HaveCurrentData;
+ newReadyState = MediaPlayer::HaveCurrentData;
m_haveReportedFirstVideoFrame = true;
m_player->firstVideoFrameAvailable();
}
- if (m_networkState != oldNetworkState)
- m_player->networkStateChanged();
+#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
- if (m_readyState != oldReadyState)
- m_player->readyStateChanged();
+ setNetworkState(newNetworkState);
+ setReadyState(newReadyState);
if (m_playWhenFramesAvailable && hasAvailableVideoFrame()) {
m_playWhenFramesAvailable = false;
platformPlay();
}
-
-#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
}
void MediaPlayerPrivateAVFoundation::setSize(const IntSize&)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (182080 => 182081)
--- 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)
@@ -270,6 +270,8 @@
void setIgnoreLoadStateChanges(bool delay) { m_ignoreLoadStateChanges = delay; }
void setNaturalSize(FloatSize);
bool isLiveStream() const { return std::isinf(duration()); }
+ void setNetworkState(MediaPlayer::NetworkState);
+ void setReadyState(MediaPlayer::ReadyState);
enum MediaRenderingMode { MediaRenderingNone, MediaRenderingToContext, MediaRenderingToLayer };
MediaRenderingMode currentRenderingMode() const;
