<!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>[201109] 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/201109">201109</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 15:49:32 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitEnterFullscreen() does not require a user gesture when RequireUserGestureForAudioRateChange is set.
https://bugs.webkit.org/show_bug.cgi?id=157803
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/video-play-audio-require-user-gesture.html
Refactor the setting of restrictions in the HTMLMediaElement constructor, and in so doing, only
relax the RequireUserGestureForFullscreen restriction if both videoPlaybackRequiresUserGesture()
and audioPlaybackRequiresUserGesture() settings are not set.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement):
LayoutTests:
* media/video-play-audio-require-user-gesture-expected.txt: Added.
* media/video-play-audio-require-user-gesture.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideoplayaudiorequireusergestureexpectedtxt">trunk/LayoutTests/media/video-play-audio-require-user-gesture-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideoplayaudiorequireusergesturehtml">trunk/LayoutTests/media/video-play-audio-require-user-gesture.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201108 => 201109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-18 22:45:37 UTC (rev 201108)
+++ trunk/LayoutTests/ChangeLog 2016-05-18 22:49:32 UTC (rev 201109)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-18 Jer Noble <jer.noble@apple.com>
+
+ webkitEnterFullscreen() does not require a user gesture when RequireUserGestureForAudioRateChange is set.
+ https://bugs.webkit.org/show_bug.cgi?id=157803
+
+ Reviewed by Eric Carlson.
+
+ * media/video-play-audio-require-user-gesture-expected.txt: Added.
+ * media/video-play-audio-require-user-gesture.html: Added.
+
</ins><span class="cx"> 2016-05-18 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r186569): media/restore-from-page-cache.html is very flaky
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideoplayaudiorequireusergestureexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-play-audio-require-user-gesture-expected.txt (0 => 201109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-play-audio-require-user-gesture-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-play-audio-require-user-gesture-expected.txt 2016-05-18 22:49:32 UTC (rev 201109)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Test that video play(), pause() and webkitEnterFullScreen() should not work unless a user clicked on the play button.
+
+
+EVENT(canplaythrough)
+
+* No user gesture initiated
+RUN(video.play())
+TEST(video.webkitEnterFullScreen()) THROWS(DOMException.INVALID_STATE_ERR) OK
+EXPECTED (video.paused == 'true') OK
+
+* User gesture initiated
+EVENT(playing)
+RUN(video.pause())
+EVENT(pause)
+EXPECTED (video.paused == 'true') OK
+RUN(video.webkitEnterFullScreen())
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideoplayaudiorequireusergesturehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-play-audio-require-user-gesture.html (0 => 201109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-play-audio-require-user-gesture.html (rev 0)
+++ trunk/LayoutTests/media/video-play-audio-require-user-gesture.html 2016-05-18 22:49:32 UTC (rev 201109)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+<html>
+ <head>
+ <title>Test that video play, pause and enterfullscreen does not work unless a user gesture is involved in playing a video</title>
+ <script src=media-controls.js></script>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var userGestureInitiated = 0;
+ if (window.internals)
+ window.internals.settings.setAudioPlaybackRequiresUserGesture(true);
+
+ function click()
+ {
+ if (window.eventSender) {
+ var playCoords;
+ try {
+ playCoords = mediaControlsButtonCoordinates(video, "play-button");
+ } catch (exception) {
+ failTest(exception.description);
+ return;
+ }
+ var x = playCoords[0];
+ var y = playCoords[1];
+
+ userGestureInitiated = 1;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+ }
+
+ function playing()
+ {
+ if (userGestureInitiated == 0) {
+ failTest("Should not play without user gesture.");
+ } else {
+ run("video.pause()");
+ }
+ }
+
+ function pause()
+ {
+ testExpected("video.paused", true);
+ // Now video.webkitEnterFullScreen() should no longer throw any exception.
+ // However, the video element may not always enter fullscreen. For example,
+ // chromium uses fullscreen API which still requires user gesture
+ try {
+ run("video.webkitEnterFullScreen()");
+ } catch(ex) {
+ failTest("video.webkitEnterFullScreen() still requires user gesture.");
+ }
+ endTest();
+ }
+
+ function canplaythrough()
+ {
+ consoleWrite("");
+ consoleWrite("* No user gesture initiated");
+ run("video.play()");
+ testDOMException("video.webkitEnterFullScreen()", "DOMException.INVALID_STATE_ERR");
+ testExpected("video.paused", true);
+ consoleWrite("");
+
+ consoleWrite("* User gesture initiated");
+ click();
+ }
+
+ function start()
+ {
+ findMediaElement();
+ waitForEvent('canplaythrough', canplaythrough);
+ waitForEvent('playing', playing);
+ waitForEvent('pause', pause);
+ video.src = findMediaFile("video", "content/test");
+ }
+ </script>
+ </head>
+
+ <body onload="start()">
+ <p>Test that video play(), pause() and webkitEnterFullScreen() should not work unless a user clicked on the play button.</p>
+ <video controls></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201108 => 201109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-18 22:45:37 UTC (rev 201108)
+++ trunk/Source/WebCore/ChangeLog 2016-05-18 22:49:32 UTC (rev 201109)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-05-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ webkitEnterFullscreen() does not require a user gesture when RequireUserGestureForAudioRateChange is set.
+ https://bugs.webkit.org/show_bug.cgi?id=157803
+
+ Reviewed by Eric Carlson.
+
+ Test: media/video-play-audio-require-user-gesture.html
+
+ Refactor the setting of restrictions in the HTMLMediaElement constructor, and in so doing, only
+ relax the RequireUserGestureForFullscreen restriction if both videoPlaybackRequiresUserGesture()
+ and audioPlaybackRequiresUserGesture() settings are not set.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+
+2016-05-18 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> Playback session sends audio and text track lists when media does not have audio or text tracks.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157865
</span><span class="cx"> <rdar://problem/25992750>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (201108 => 201109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-18 22:45:37 UTC (rev 201108)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-18 22:49:32 UTC (rev 201109)
</span><span class="lines">@@ -442,30 +442,24 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_sendProgressEvents = false;
</span><span class="cx"> #endif
</span><del>- if (!settings || settings->videoPlaybackRequiresUserGesture()) {
- // Allow autoplay in a MediaDocument that is not in an iframe.
- if (document.ownerElement() || !document.isMediaDocument()) {
- m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForVideoRateChange);
- m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForLoad);
- }
-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToShowPlaybackTargetPicker);
-#endif
- }
-#if PLATFORM(IOS)
- else {
- // Relax RequireUserGestureForFullscreen when videoPlaybackRequiresUserGesture is not set:
- m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequireUserGestureForFullscreen);
- }
-#endif
</del><span class="cx">
</span><span class="cx"> if (settings && settings->invisibleAutoplayNotPermitted())
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::InvisibleAutoplayNotPermitted);
</span><span class="cx">
</span><span class="cx"> if (document.ownerElement() || !document.isMediaDocument()) {
</span><ins>+ if (settings && settings->videoPlaybackRequiresUserGesture()) {
+ m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForVideoRateChange);
+ m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForLoad);
+ }
+
</ins><span class="cx"> if (settings && settings->audioPlaybackRequiresUserGesture())
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForAudioRateChange);
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (settings && (settings->videoPlaybackRequiresUserGesture() || settings->audioPlaybackRequiresUserGesture()))
+ m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToShowPlaybackTargetPicker);
+#endif
+
</ins><span class="cx"> if (!settings || !settings->mediaDataLoadsAutomatically())
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::AutoPreloadingNotPermitted);
</span><span class="cx">
</span><span class="lines">@@ -473,6 +467,13 @@
</span><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::OverrideUserGestureRequirementForMainContent);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ if (settings && !settings->videoPlaybackRequiresUserGesture() && !settings->audioPlaybackRequiresUserGesture()) {
+ // Relax RequireUserGestureForFullscreen when videoPlaybackRequiresUserGesture and audioPlaybackRequiresUserGesture is not set:
+ m_mediaSession->removeBehaviorRestriction(MediaElementSession::RequireUserGestureForFullscreen);
+ }
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (document.page())
</span><span class="cx"> m_captionDisplayMode = document.page()->group().captionPreferences().captionDisplayMode();
</span></span></pre>
</div>
</div>
</body>
</html>