<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199667] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199667">199667</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-18 08:24:47 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media element "user gesture for fullscreen" restriction is never lifted
https://bugs.webkit.org/show_bug.cgi?id=156547
<rdar://problem/25707814>
Reviewed by Jer Noble.
Source/WebCore:
Test: media/video-fullscreen-restriction-removed.html
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::playbackPermitted): Check fullscreenPermitted rather than
checking for a user gesture because the restriction can be removed.
LayoutTests:
* media/video-fullscreen-restriction-removed-expected.txt: Added.
* media/video-fullscreen-restriction-removed.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideofullscreenrestrictionremovedexpectedtxt">trunk/LayoutTests/media/video-fullscreen-restriction-removed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideofullscreenrestrictionremovedhtml">trunk/LayoutTests/media/video-fullscreen-restriction-removed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199666 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-18 15:23:45 UTC (rev 199666)
+++ trunk/LayoutTests/ChangeLog 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-18 Eric Carlson <eric.carlson@apple.com>
+
+ Media element "user gesture for fullscreen" restriction is never lifted
+ https://bugs.webkit.org/show_bug.cgi?id=156547
+ <rdar://problem/25707814>
+
+ Reviewed by Jer Noble.
+
+ * media/video-fullscreen-restriction-removed-expected.txt: Added.
+ * media/video-fullscreen-restriction-removed.html: Added.
+
</ins><span class="cx"> 2016-04-18 Frederic Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Mark script-height reftest as ImageOnlyFailure on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreenrestrictionremovedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-fullscreen-restriction-removed-expected.txt (0 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreen-restriction-removed-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-fullscreen-restriction-removed-expected.txt 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+Test that "fullscreen requires user gesture restriction" is removed by a user gesture.
+
+Click me!
+RUN(internals.settings.setAllowsInlineMediaPlayback(false))
+RUN(internals.setMediaElementRestrictions(video, "RequireUserGestureForFullscreen"))
+* set video.src
+
+EVENT(loadedmetadata)
+
+* video.play() should fail
+RUN(video.play())
+EXPECTED (video.paused == 'true') OK
+
+* clicking button
+
+EVENT(click)
+* video.play() should work from within a click handler
+EXPECTED (video.paused == 'true') OK
+RUN(video.play())
+
+EVENT(webkitfullscreenchange)
+EXPECTED (video.paused == 'false') OK
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreenrestrictionremovedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-fullscreen-restriction-removed.html (0 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreen-restriction-removed.html (rev 0)
+++ trunk/LayoutTests/media/video-fullscreen-restriction-removed.html 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<html>
+ <head>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+
+ function start()
+ {
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+
+ findMediaElement();
+
+ run('internals.settings.setAllowsInlineMediaPlayback(false)');
+ run('internals.setMediaElementRestrictions(video, "RequireUserGestureForFullscreen")');
+
+ waitForEvent('loadedmetadata', loadedmetadata)
+ waitForEvent('webkitfullscreenchange', fullscreenChanged, false, true, document)
+ waitForEvent('click', clickHandler, false, true, document.getElementById('button'))
+
+ consoleWrite('* set video.src');
+ video.src = findMediaFile('video', 'content/test');
+ consoleWrite('');
+ }
+
+ function loadedmetadata()
+ {
+ consoleWrite('');
+ if (window.eventSender) {
+ consoleWrite('* video.play() should fail ');
+ run('video.play()');
+ testExpected('video.paused', true);
+ consoleWrite('');
+
+ consoleWrite('* clicking button<br>');
+ var button = document.getElementById('button');
+ eventSender.mouseMoveTo(button.offsetLeft + 20, button.offsetTop + 7);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ } else {
+ consoleWrite('* click on the "Click me!" button to proceed<br>');
+ }
+ }
+
+ function clickHandler()
+ {
+ consoleWrite('* video.play() should work from within a click handler');
+ testExpected('video.paused', true);
+ run('video.play()');
+ consoleWrite('');
+ failTestIn(2000);
+ }
+
+ function fullscreenChanged()
+ {
+ testExpected('video.paused', false);
+ consoleWrite('');
+ endTest();
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <p>Test that "fullscreen requires user gesture restriction" is removed by a user gesture.</p>
+ <video controls></video>
+ <button id="button" >Click me!</button><br>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (199666 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-18 15:23:45 UTC (rev 199666)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -1267,9 +1267,6 @@
</span><span class="cx"> # WOFF2 is only supported on certain Operating Systems.
</span><span class="cx"> webkit.org/b/150830 [ Yosemite ElCapitan ] fast/text/woff2.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-# AppleTV not supported on Yosemite
-[ Yosemite ] media/controls/airplay-picker.html
-
</del><span class="cx"> webkit.org/b/150956 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/event_loadeddata.html [ Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/140217 http/tests/navigation/forward-and-cancel.html [ Pass Failure ]
</span><span class="lines">@@ -1289,9 +1286,12 @@
</span><span class="cx">
</span><span class="cx"> # WIRELESS_PLAYBACK_TARGET not enabled on Yosemite.
</span><span class="cx"> [ Yosemite ] media/airplay-target-availability.html
</span><ins>+[ Yosemite ] media/controls/airplay-picker.html
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/153086 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.3_encodeURI/S15.1.3.3_A2.4_T2.html [ Pass Crash ]
</span><span class="cx">
</span><ins>+[ Yosemite ] media/video-fullscreen-restriction-removed.html [ Skip ]
+
</ins><span class="cx"> webkit.org/b/153752 [ Yosemite ] http/tests/plugins/visible_plugins.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/153809 transitions/clip-path-transitions.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199666 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-18 15:23:45 UTC (rev 199666)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-18 Eric Carlson <eric.carlson@apple.com>
+
+ Media element "user gesture for fullscreen" restriction is never lifted
+ https://bugs.webkit.org/show_bug.cgi?id=156547
+ <rdar://problem/25707814>
+
+ Reviewed by Jer Noble.
+
+ Test: media/video-fullscreen-restriction-removed.html
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::playbackPermitted): Check fullscreenPermitted rather than
+ checking for a user gesture because the restriction can be removed.
+
</ins><span class="cx"> 2016-04-18 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Refactor RenderMathMLScripts layout to avoid using flexbox
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (199666 => 199667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-18 15:23:45 UTC (rev 199666)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-18 15:24:47 UTC (rev 199667)
</span><span class="lines">@@ -146,8 +146,8 @@
</span><span class="cx"> if (pageExplicitlyAllowsElementToAutoplayInline(element))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (requiresFullscreenForVideoPlayback(element) && !ScriptController::processingUserGestureForMedia()) {
- LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE");
</del><ins>+ if (requiresFullscreenForVideoPlayback(element) && !fullscreenPermitted(element)) {
+ LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE because of fullscreen restriction");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -155,12 +155,12 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (m_restrictions & RequireUserGestureForVideoRateChange && element.isVideo() && !ScriptController::processingUserGestureForMedia()) {
</span><del>- LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE");
</del><ins>+ LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE because of video rate change restriction");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_restrictions & RequireUserGestureForAudioRateChange && (!element.isVideo() || element.hasAudio()) && !ScriptController::processingUserGestureForMedia()) {
</span><del>- LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE");
</del><ins>+ LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE because of audio rate change restriction");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>