<!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>[169449] 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/169449">169449</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-29 09:26:46 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use correct version of requiresFullscreenForVideoPlayback().
https://bugs.webkit.org/show_bug.cgi?id=133331
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-05-29
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/video-fullscreeen-only-controls.html
Update the last place not yet using m_mediaSession->requiresFullscreenForVideoPlayback.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
switch to media session version for requriesFullscreenForVideoPlayback.
LayoutTests:
* media/video-fullscreeen-only-controls-expected.txt: Added.
* media/video-fullscreeen-only-controls.html: Added. Make sure video element
controls show even when not specified if inline playback is restricted.</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="#trunkLayoutTestsmediavideofullscreeenonlycontrolsexpectedtxt">trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideofullscreeenonlycontrolshtml">trunk/LayoutTests/media/video-fullscreeen-only-controls.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169448 => 169449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-29 16:10:45 UTC (rev 169448)
+++ trunk/LayoutTests/ChangeLog 2014-05-29 16:26:46 UTC (rev 169449)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-29 Jeremy Jones <jeremyj@apple.com>
+
+ Use correct version of requiresFullscreenForVideoPlayback().
+ https://bugs.webkit.org/show_bug.cgi?id=133331
+
+ Reviewed by Eric Carlson.
+
+ * media/video-fullscreeen-only-controls-expected.txt: Added.
+ * media/video-fullscreeen-only-controls.html: Added. Make sure video element
+ controls show even when not specified if inline playback is restricted.
+
</ins><span class="cx"> 2014-05-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2][GTK] ASSERTION FAILED: m_status == Scheduled in GMainLoopSource
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreeenonlycontrolsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt (0 => 169449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt 2014-05-29 16:26:46 UTC (rev 169449)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests that when inline-playback is restricted, the video element's "controls" are always shown while inline.
+
+
+RUN(internals.setMediaSessionRestrictions('video', 'InlineVideoPlaybackRestricted'))
+EXPECTED (shadowRoot = internals.shadowRoot(video) != 'null') OK
+EXPECTED (panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel') != 'null') OK
+EXPECTED (internals.shadowPseudoId(panel) == '-webkit-media-controls-panel') OK
+EXPECTED (document.defaultView.getComputedStyle(panel)['display'] != 'none') OK
+EXPECTED (document.defaultView.getComputedStyle(panel)['height'] >= '20px') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideofullscreeenonlycontrolshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-fullscreeen-only-controls.html (0 => 169449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-fullscreeen-only-controls.html (rev 0)
+++ trunk/LayoutTests/media/video-fullscreeen-only-controls.html 2014-05-29 16:26:46 UTC (rev 169449)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<body>
+ <p>This tests that when inline-playback is restricted, the video element's "controls" are always shown while inline.</p>
+ <video id="video" width="300"></video>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script src=media-controls.js></script>
+ <script>
+
+ var shadowRoot;
+ var panel;
+
+ run("internals.setMediaSessionRestrictions('video', 'InlineVideoPlaybackRestricted')");
+
+ var video = document.getElementById('video');
+ video.src = findMediaFile("video", "content/test");
+
+ if (window.internals) {
+ testExpected("shadowRoot = internals.shadowRoot(video)", null, "!=");
+ testExpected("panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel')", null, "!=");
+ testExpected("internals.shadowPseudoId(panel)", "-webkit-media-controls-panel");
+ testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none', "!=");
+ testExpected("document.defaultView.getComputedStyle(panel)['height']", '20px', ">=");
+ }
+ else
+ logResult(false, "window.internals == undefined");
+
+ endTest();
+ </script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169448 => 169449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-29 16:10:45 UTC (rev 169448)
+++ trunk/Source/WebCore/ChangeLog 2014-05-29 16:26:46 UTC (rev 169449)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-29 Jeremy Jones <jeremyj@apple.com>
+
+ Use correct version of requiresFullscreenForVideoPlayback().
+ https://bugs.webkit.org/show_bug.cgi?id=133331
+
+ Reviewed by Eric Carlson.
+
+ Test: media/video-fullscreeen-only-controls.html
+
+ Update the last place not yet using m_mediaSession->requiresFullscreenForVideoPlayback.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ switch to media session version for requriesFullscreenForVideoPlayback.
+
</ins><span class="cx"> 2014-05-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add support for HiDPI icons
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (169448 => 169449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-29 16:10:45 UTC (rev 169448)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-29 16:26:46 UTC (rev 169449)
</span><span class="lines">@@ -2930,7 +2930,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // always show controls for video when fullscreen playback is required.
</span><del>- if (isVideo() && document().page() && document().page()->chrome().requiresFullscreenForVideoPlayback())
</del><ins>+ if (isVideo() && m_mediaSession->requiresFullscreenForVideoPlayback(*this))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Always show controls when in full screen mode.
</span></span></pre>
</div>
</div>
</body>
</html>