Title: [234043] branches/safari-606-branch/Source/WebCore
- Revision
- 234043
- Author
- [email protected]
- Date
- 2018-07-20 09:51:03 -0700 (Fri, 20 Jul 2018)
Log Message
Cherry-pick r234002. rdar://problem/42432954
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234042 => 234043)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-20 16:42:54 UTC (rev 234042)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-20 16:51:03 UTC (rev 234043)
@@ -1,5 +1,42 @@
2018-07-20 Babak Shafiei <[email protected]>
+ Cherry-pick r234002. rdar://problem/42432954
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-20 Babak Shafiei <[email protected]>
+
Cherry-pick r234013. rdar://problem/42417130
Crash under WebCore::DocumentWriter::addData()
Modified: branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp (234042 => 234043)
--- branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-20 16:42:54 UTC (rev 234042)
+++ branches/safari-606-branch/Source/WebCore/html/HTMLMediaElement.cpp 2018-07-20 16:51:03 UTC (rev 234043)
@@ -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
