Title: [234002] trunk/Source/WebCore
- Revision
- 234002
- Author
- [email protected]
- Date
- 2018-07-19 13:48:43 -0700 (Thu, 19 Jul 2018)
Log Message
REGRESSION(r233926): media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-pip-to-inline.html is a TIMEOUT failure
https://bugs.webkit.org/show_bug.cgi?id=187813
Reviewed by Jon Lee.
In r233926, we changed the behavior of entering PiP to exit fullscreen only after entering PiP completes. The
test in question will immediately request "inline" presentation mode once the PiP animation begins, and thus
it's asking to "exit fullscreen" when both in standard fullscreen and also in PiP. The fix is not to bail out
early if we're in standard (element) fullscreen, but to allow the remaining steps to complete and exit PiP as
well.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::exitFullscreen):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (234001 => 234002)
--- trunk/Source/WebCore/ChangeLog 2018-07-19 20:42:20 UTC (rev 234001)
+++ trunk/Source/WebCore/ChangeLog 2018-07-19 20:48:43 UTC (rev 234002)
@@ -1,3 +1,19 @@
+2018-07-19 Jer Noble <[email protected]>
+
+ REGRESSION(r233926): media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-pip-to-inline.html is a TIMEOUT failure
+ https://bugs.webkit.org/show_bug.cgi?id=187813
+
+ Reviewed by Jon Lee.
+
+ In r233926, we changed the behavior of entering PiP to exit fullscreen only after entering PiP completes. The
+ test in question will immediately request "inline" presentation mode once the PiP animation begins, and thus
+ it's asking to "exit fullscreen" when both in standard fullscreen and also in PiP. The fix is not to bail out
+ early if we're in standard (element) fullscreen, but to allow the remaining steps to complete and exit PiP as
+ well.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::exitFullscreen):
+
2018-07-19 Zalan Bujtas <[email protected]>
[LFC] Introduce simple line breaker.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (234001 => 234002)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-19 20:42:20 UTC (rev 234001)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-19 20:48:43 UTC (rev 234002)
@@ -5958,7 +5958,9 @@
if (document().settings().fullScreenEnabled() && document().webkitCurrentFullScreenElement() == this) {
if (document().webkitIsFullScreen())
document().webkitCancelFullScreen();
- return;
+
+ if (m_videoFullscreenMode == VideoFullscreenModeStandard)
+ return;
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
