Title: [280614] branches/safari-612.1-branch/Source/WebCore
- Revision
- 280614
- Author
- [email protected]
- Date
- 2021-08-03 13:54:17 -0700 (Tue, 03 Aug 2021)
Log Message
Cherry-pick r280589. rdar://problem/81471336
REGRESSION (r280531): multiple modern-media-controls tests have become flaky timeouts
https://bugs.webkit.org/show_bug.cgi?id=228714
<rdar://problem/81426715>
Reviewed by Eric Carlson.
Update preferredRenderingMode() to reflect what setUpVideoRendering() actually does: use
MediaRenderingToContext whenever possible. This will cause setUpVideoRendering() to be
called from updateStates() to create the context, even if the element has been marked as
!isVisible() by RenderVideo upon removal from the DOM.
Also, in renderingModeChanged(), don't attempt to deduce whether scheduleUpdateStates()
should be called; just call it universally.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode const):
(WebCore::MediaPlayerPrivateAVFoundation::renderingModeChanged):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1-branch/Source/WebCore/ChangeLog (280613 => 280614)
--- branches/safari-612.1-branch/Source/WebCore/ChangeLog 2021-08-03 20:54:14 UTC (rev 280613)
+++ branches/safari-612.1-branch/Source/WebCore/ChangeLog 2021-08-03 20:54:17 UTC (rev 280614)
@@ -1,5 +1,50 @@
2021-08-03 Russell Epstein <[email protected]>
+ Cherry-pick r280589. rdar://problem/81471336
+
+ REGRESSION (r280531): multiple modern-media-controls tests have become flaky timeouts
+ https://bugs.webkit.org/show_bug.cgi?id=228714
+ <rdar://problem/81426715>
+
+ Reviewed by Eric Carlson.
+
+ Update preferredRenderingMode() to reflect what setUpVideoRendering() actually does: use
+ MediaRenderingToContext whenever possible. This will cause setUpVideoRendering() to be
+ called from updateStates() to create the context, even if the element has been marked as
+ !isVisible() by RenderVideo upon removal from the DOM.
+
+ Also, in renderingModeChanged(), don't attempt to deduce whether scheduleUpdateStates()
+ should be called; just call it universally.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode const):
+ (WebCore::MediaPlayerPrivateAVFoundation::renderingModeChanged):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-03 Jer Noble <[email protected]>
+
+ REGRESSION (r280531): multiple modern-media-controls tests have become flaky timeouts
+ https://bugs.webkit.org/show_bug.cgi?id=228714
+ <rdar://problem/81426715>
+
+ Reviewed by Eric Carlson.
+
+ Update preferredRenderingMode() to reflect what setUpVideoRendering() actually does: use
+ MediaRenderingToContext whenever possible. This will cause setUpVideoRendering() to be
+ called from updateStates() to create the context, even if the element has been marked as
+ !isVisible() by RenderVideo upon removal from the DOM.
+
+ Also, in renderingModeChanged(), don't attempt to deduce whether scheduleUpdateStates()
+ should be called; just call it universally.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode const):
+ (WebCore::MediaPlayerPrivateAVFoundation::renderingModeChanged):
+
+2021-08-03 Russell Epstein <[email protected]>
+
Cherry-pick r280587. rdar://problem/81473679
Crash in webgl/1.0.x/conformance/textures/misc/texture-with-flip-y-and-premultiply-alpha.html
Modified: branches/safari-612.1-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (280613 => 280614)
--- branches/safari-612.1-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2021-08-03 20:54:14 UTC (rev 280613)
+++ branches/safari-612.1-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2021-08-03 20:54:17 UTC (rev 280614)
@@ -105,7 +105,7 @@
MediaPlayerPrivateAVFoundation::MediaRenderingMode MediaPlayerPrivateAVFoundation::preferredRenderingMode() const
{
- if (!m_visible || assetStatus() == MediaPlayerAVAssetStatusUnknown)
+ if (assetStatus() == MediaPlayerAVAssetStatusUnknown)
return MediaRenderingNone;
if (supportsAcceleratedRendering() && m_player->renderingCanBeAccelerated())
@@ -468,8 +468,7 @@
void MediaPlayerPrivateAVFoundation::renderingModeChanged()
{
- if (m_delayingReadyState && m_cachedHasVideo && hasAvailableVideoFrame())
- scheduleUpdateStates();
+ scheduleUpdateStates();
m_player->renderingModeChanged();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
