Title: [119032] branches/safari-536-branch/Source/WebCore
- Revision
- 119032
- Author
- [email protected]
- Date
- 2012-05-30 20:14:38 -0700 (Wed, 30 May 2012)
Log Message
Merged r118314 -> <rdar://problem/11497837>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (119031 => 119032)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:12:49 UTC (rev 119031)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-31 03:14:38 UTC (rev 119032)
@@ -1,5 +1,29 @@
2012-05-30 Lucas Forschler <[email protected]>
+ Merge 118314
+
+ 2012-05-23 Jer Noble <[email protected]>
+
+ REGRESSION: compositing/video/video-poster.html fails on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=87199
+
+ Reviewed by Maciej Stachowiak.
+
+ No new tests; fixes failing compositing/video/video-poster.html test.
+
+ Instead of creating the video layer directly, simply allow the layer
+ to be created in updateStates() by changing the definition of
+ isReadyForVideoSetup() to bypass the m_isAllowedToRender check if
+ the player reports a video track is present. This causes the video layer
+ to be created and for future calls to prepareForRendering() to result
+ in calls to mediaPlayerRenderingModeChanged().
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::isReadyForVideoSetup):
+ (WebCore::MediaPlayerPrivateAVFoundation::metadataLoaded):
+
+2012-05-30 Lucas Forschler <[email protected]>
+
Merge 118087
2012-05-22 Jer Noble <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (119031 => 119032)
--- branches/safari-536-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2012-05-31 03:12:49 UTC (rev 119031)
+++ branches/safari-536-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2012-05-31 03:14:38 UTC (rev 119032)
@@ -378,7 +378,10 @@
bool MediaPlayerPrivateAVFoundation::isReadyForVideoSetup() const
{
- return m_isAllowedToRender && m_readyState >= MediaPlayer::HaveMetadata && m_player->visible();
+ // AVFoundation will not return true for firstVideoFrameAvailable until
+ // an AVPlayerLayer has been added to the AVPlayerItem, so allow video setup
+ // here if a video track to trigger allocation of a AVPlayerLayer.
+ return (m_isAllowedToRender || m_cachedHasVideo) && m_readyState >= MediaPlayer::HaveMetadata && m_player->visible();
}
void MediaPlayerPrivateAVFoundation::prepareForRendering()
@@ -530,14 +533,6 @@
{
m_loadingMetadata = false;
tracksChanged();
-
-#if USE(ACCELERATED_COMPOSITING)
- // AVFoundation will not return true for firstVideoFrameAvailable until
- // an AVPlayerLayer has been added to the AVPlayerItem, so call createVideoLayer()
- // here to trigger allocation of a AVPlayerLayer.
- if (m_cachedHasVideo)
- createVideoLayer();
-#endif
}
void MediaPlayerPrivateAVFoundation::rateChanged()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
