<!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>[202660] 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/202660">202660</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 17:12:07 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unprefix webkit-playsinline.
https://bugs.webkit.org/show_bug.cgi?id=159283
Reviewed by Eric Carlson.
Tests: media/video-playsinline.html
media/video-webkit-playsinline.html
Unprefix the webkit-playsinline content attribute, as an unprefixed version
was added to the HTML spec by <https://github.com/whatwg/html/pull/1444>.
The new 'playsinline' content attribute reflects to a new DOM property of
the same name.
* html/HTMLAttributeNames.in:
* html/HTMLVideoElement.idl:
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttributeNamesin">trunk/Source/WebCore/html/HTMLAttributeNames.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementidl">trunk/Source/WebCore/html/HTMLVideoElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideoplaysinlineexpectedtxt">trunk/LayoutTests/media/video-playsinline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideoplaysinlinehtml">trunk/LayoutTests/media/video-playsinline.html</a></li>
<li><a href="#trunkLayoutTestsmediavideowebkitplaysinlineexpectedtxt">trunk/LayoutTests/media/video-webkit-playsinline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideowebkitplaysinlinehtml">trunk/LayoutTests/media/video-webkit-playsinline.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsmediavideoplaysinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-playsinline-expected.txt (0 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-playsinline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-playsinline-expected.txt 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.playsinline = false)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.playsinline = true)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.playsinline = false)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.playsinline = true)
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideoplaysinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-playsinline.html (0 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-playsinline.html (rev 0)
+++ trunk/LayoutTests/media/video-playsinline.html 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="media-file.js"></script>
+<script src="video-test.js"></script>
+<script>
+function go()
+{
+ runNextTest();
+}
+
+function runNextTest()
+{
+ if (tests.length)
+ tests.shift()();
+ else
+ endTest();
+}
+
+function testPlaysInline(requiresPlaysInline, hasPlaysInline, expectedDisplayingFullscreen)
+{
+ run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
+ video = media = document.createElement('video');
+ document.body.appendChild(video);
+ video.controls = true;
+ video.src = findMediaFile('video', 'content/test');
+ run('video.playsinline = ' + hasPlaysInline);
+ waitForEventOnce('canplaythrough', () => {
+ runWithKeyDown(() => {
+ run('video.play()');
+ });
+ })
+ waitForEventOnce('playing', () => {
+ testExpected('video.webkitDisplayingFullscreen', expectedDisplayingFullscreen);
+ document.body.removeChild(video);
+ runNextTest();
+ });
+}
+
+function testRequiresPlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(true, false, true);
+}
+
+function testRequiresPlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(true, true, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(false, false, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(false, true, false);
+}
+
+var tests = [
+ testRequiresPlaysInlineAndDoesntHaveIt,
+ testRequiresPlaysInlineAndDoesHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesntHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesHaveIt,
+];
+
+</script>
+</head>
+<body onload="go()">
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideowebkitplaysinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (0 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-webkit-playsinline-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline-expected.txt 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.removeAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.setAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.removeAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.setAttribute("webkit-playsinline"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideowebkitplaysinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-webkit-playsinline.html (0 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-webkit-playsinline.html (rev 0)
+++ trunk/LayoutTests/media/video-webkit-playsinline.html 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="media-file.js"></script>
+<script src="video-test.js"></script>
+<script>
+function go()
+{
+ runNextTest();
+}
+
+function runNextTest()
+{
+ if (tests.length)
+ tests.shift()();
+ else
+ endTest();
+}
+
+function testPlaysInline(requiresPlaysInline, hasWebkitPlaysInline, expectedDisplayingFullscreen)
+{
+ run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
+ video = media = document.createElement('video');
+ document.body.appendChild(video);
+ video.controls = true;
+ video.src = findMediaFile('video', 'content/test');
+ run('video.' + (hasWebkitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
+ waitForEventOnce('canplaythrough', () => {
+ runWithKeyDown(() => {
+ run('video.play()');
+ });
+ })
+ waitForEventOnce('playing', () => {
+ testExpected('video.webkitDisplayingFullscreen', expectedDisplayingFullscreen);
+ document.body.removeChild(video);
+ runNextTest();
+ });
+}
+
+function testRequiresPlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(true, false, true);
+}
+
+function testRequiresPlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(true, true, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(false, false, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(false, true, false);
+}
+
+var tests = [
+ testRequiresPlaysInlineAndDoesntHaveIt,
+ testRequiresPlaysInlineAndDoesHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesntHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesHaveIt,
+];
+
+</script>
+</head>
+<body onload="go()">
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202659 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/ChangeLog 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-29 Jer Noble <jer.noble@apple.com>
+
+ Unprefix webkit-playsinline.
+ https://bugs.webkit.org/show_bug.cgi?id=159283
+
+ Reviewed by Eric Carlson.
+
+ Tests: media/video-playsinline.html
+ media/video-webkit-playsinline.html
+
+ Unprefix the webkit-playsinline content attribute, as an unprefixed version
+ was added to the HTML spec by <https://github.com/whatwg/html/pull/1444>.
+ The new 'playsinline' content attribute reflects to a new DOM property of
+ the same name.
+
+ * html/HTMLAttributeNames.in:
+ * html/HTMLVideoElement.idl:
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
+
</ins><span class="cx"> 2016-06-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix null dereferencing after r201441
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttributeNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (202659 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -299,6 +299,7 @@
</span><span class="cx"> optimum
</span><span class="cx"> pattern
</span><span class="cx"> placeholder
</span><ins>+playsinline
</ins><span class="cx"> pluginspage
</span><span class="cx"> pluginurl
</span><span class="cx"> ping
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.idl (202659 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/HTMLVideoElement.idl 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> readonly attribute unsigned long videoHeight;
</span><span class="cx"> [Reflect, URL] attribute DOMString poster;
</span><span class="cx">
</span><ins>+ [Reflect] attribute boolean playsinline;
</ins><span class="cx"> readonly attribute boolean webkitSupportsFullscreen;
</span><span class="cx"> readonly attribute boolean webkitDisplayingFullscreen;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (202659 => 202660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-29 23:59:35 UTC (rev 202659)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-30 00:12:07 UTC (rev 202660)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> if (!settings || !settings->allowsInlineMediaPlayback())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr);
</del><ins>+ return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr) || element.fastHasAttribute(HTMLNames::playsinlineAttr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::allowsAutomaticMediaDataLoading(const HTMLMediaElement& element) const
</span></span></pre>
</div>
</div>
</body>
</html>