<!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>[195511] 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/195511">195511</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-23 14:51:40 -0800 (Sat, 23 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix media controls displaying without controls attribute
https://bugs.webkit.org/show_bug.cgi?id=152500
Media controls is not displayed without controls attribute by default
when the video element has text track. It'll be displayed on fullscreen
regardless of controls attribute.
Patch by Wonchul Lee <wonchul.lee@collabora.co.uk> on 2016-01-23
Reviewed by Michael Catanzaro.
Source/WebCore:
* Modules/mediacontrols/mediaControlsGtk.js:
(ControllerGtk.prototype.shouldHaveControls):
(ControllerGtk.prototype.reconnectControls):
(ControllerGtk.prototype.removeControls):
(ControllerGtk.prototype.configureControls): Deleted.
LayoutTests:
* media/video-controls-no-display-with-text-track-expected.txt: Added.
* media/video-controls-no-display-with-text-track.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideocontrolsnodisplaywithtexttrackexpectedtxt">trunk/LayoutTests/media/video-controls-no-display-with-text-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolsnodisplaywithtexttrackhtml">trunk/LayoutTests/media/video-controls-no-display-with-text-track.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195510 => 195511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-23 10:08:26 UTC (rev 195510)
+++ trunk/LayoutTests/ChangeLog 2016-01-23 22:51:40 UTC (rev 195511)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-23 Wonchul Lee <wonchul.lee@collabora.co.uk>
+
+ [GTK] Fix media controls displaying without controls attribute
+ https://bugs.webkit.org/show_bug.cgi?id=152500
+
+ Media controls is not displayed without controls attribute by default
+ when the video element has text track. It'll be displayed on fullscreen
+ regardless of controls attribute.
+
+ Reviewed by Michael Catanzaro.
+
+ * media/video-controls-no-display-with-text-track-expected.txt: Added.
+ * media/video-controls-no-display-with-text-track.html: Added.
+
</ins><span class="cx"> 2016-01-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Implement clearing object stores and opening cursors in the SQLite backend.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolsnodisplaywithtexttrackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controls-no-display-with-text-track-expected.txt (0 => 195511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-no-display-with-text-track-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-controls-no-display-with-text-track-expected.txt 2016-01-23 22:51:40 UTC (rev 195511)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that video controls are not shown for videos with a text track when the controls attribute is not present, except when fullscreen
+
+EVENT(canplay)
+
+** Video controls should not be shown **
+EXPECTED (panel == 'null') OK
+EVENT(webkitfullscreenchange)
+
+** Video controls should be shown on fullscreen **
+EXPECTED (panel.style['display'] != 'none') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolsnodisplaywithtexttrackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controls-no-display-with-text-track.html (0 => 195511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-no-display-with-text-track.html (rev 0)
+++ trunk/LayoutTests/media/video-controls-no-display-with-text-track.html 2016-01-23 22:51:40 UTC (rev 195511)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Video controls no display with text track Test</title>
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=media-controls.js></script>
+ <script src=../fullscreen/full-screen-test.js></script>
+ <script>
+ var panel;
+
+ var startTest = function() {
+ findMediaElement();
+ waitForEvent(video, 'canplay', oncanplay);
+ video.src = findMediaFile('video', 'content/test');
+ };
+
+ var oncanplay = function() {
+ panel = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-panel");
+
+ consoleWrite("");
+ consoleWrite("** Video controls should not be shown **");
+ testExpected("panel", null, "==");
+
+ waitForEvent(video, 'webkitfullscreenchange', onfullscreenchange);
+ runWithKeyDown(function(){ video.webkitRequestFullscreen(); })
+ };
+
+ var onfullscreenchange = function() {
+ panel = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-panel");
+
+ consoleWrite("");
+ consoleWrite("** Video controls should be shown on fullscreen **");
+
+ testExpected("panel.style['display']", 'none', "!=");
+ endTest();
+ };
+ </script>
+</head>
+<body onload="startTest()">
+ Tests that video controls are not shown for videos with a text track when the controls attribute is not present, except when fullscreen<br>
+ <video>
+ <track>
+ </video>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195510 => 195511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-23 10:08:26 UTC (rev 195510)
+++ trunk/Source/WebCore/ChangeLog 2016-01-23 22:51:40 UTC (rev 195511)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-23 Wonchul Lee <wonchul.lee@collabora.co.uk>
+
+ [GTK] Fix media controls displaying without controls attribute
+ https://bugs.webkit.org/show_bug.cgi?id=152500
+
+ Media controls is not displayed without controls attribute by default
+ when the video element has text track. It'll be displayed on fullscreen
+ regardless of controls attribute.
+
+ Reviewed by Michael Catanzaro.
+
+ * Modules/mediacontrols/mediaControlsGtk.js:
+ (ControllerGtk.prototype.shouldHaveControls):
+ (ControllerGtk.prototype.reconnectControls):
+ (ControllerGtk.prototype.removeControls):
+ (ControllerGtk.prototype.configureControls): Deleted.
</ins><span class="cx"> 2016-01-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use credentials from a URL with NetworkSession like we did with ResourceHandle
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (195510 => 195511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2016-01-23 10:08:26 UTC (rev 195510)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2016-01-23 22:51:40 UTC (rev 195511)
</span><span class="lines">@@ -54,18 +54,19 @@
</span><span class="cx"> this.controls.enclosure.appendChild(this.controls.panel);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- configureControls: function() {
- if (this.controls.configured)
- return;
-
- this.configureInlineControls();
- this.controls.configured = true;
- this.addControls();
</del><ins>+ shouldHaveControls: function()
+ {
+ return this.video.controls || this.isFullScreen();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> reconnectControls: function()
</span><span class="cx"> {
</span><del>- this.configureControls();
</del><ins>+ Controller.prototype.disconnectControls.apply(this, arguments);
+
+ this.configureInlineControls();
+
+ if (this.shouldHaveControls())
+ this.addControls();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setStatusHidden: function(hidden)
</span><span class="lines">@@ -133,6 +134,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ removeControls: function()
+ {
+ if (this.controls.enclosure.parentNode)
+ this.controls.enclosure.parentNode.removeChild(this.controls.enclosure);
+ this.destroyCaptionMenu();
+ },
+
</ins><span class="cx"> addControls: function()
</span><span class="cx"> {
</span><span class="cx"> this.base.appendChild(this.controls.enclosure);
</span></span></pre>
</div>
</div>
</body>
</html>