<!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>[164711] 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/164711">164711</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-02-26 01:41:43 -0800 (Wed, 26 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Regression when showing the captions menu
https://bugs.webkit.org/show_bug.cgi?id=129106
Reviewed by Martin Robinson.
Source/WebCore:
In some cases, when clicking the captions button the menu was not
shown.
Updated test: media/video-controls-captions-trackmenu.html
* Modules/mediacontrols/mediaControlsGtk.js:
(ControllerGtk.prototype.buildCaptionMenu):
(ControllerGtk.prototype.showCaptionMenu): Specify sizes in
pixels.
LayoutTests:
Checked in an existing test that the menu is shown then the
captions button is clicked.
* media/trackmenu-test.js:
(startTrackMenuTest): Deactivated animations
* media/video-controls-captions-trackmenu.html: Added check for
the regression we are testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackmenutestjs">trunk/LayoutTests/media/trackmenu-test.js</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrolscaptionstrackmenuhtml">trunk/LayoutTests/media/video-controls-captions-trackmenu.html</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164710 => 164711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-26 09:02:20 UTC (rev 164710)
+++ trunk/LayoutTests/ChangeLog 2014-02-26 09:41:43 UTC (rev 164711)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-26 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Regression when showing the captions menu
+ https://bugs.webkit.org/show_bug.cgi?id=129106
+
+ Reviewed by Martin Robinson.
+
+ Checked in an existing test that the menu is shown then the
+ captions button is clicked.
+
+ * media/trackmenu-test.js:
+ (startTrackMenuTest): Deactivated animations
+ * media/video-controls-captions-trackmenu.html: Added check for
+ the regression we are testing.
+
</ins><span class="cx"> 2014-02-25 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Add support for minsize/maxsize attributes.
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackmenutestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/trackmenu-test.js (164710 => 164711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/trackmenu-test.js 2014-02-26 09:02:20 UTC (rev 164710)
+++ trunk/LayoutTests/media/trackmenu-test.js 2014-02-26 09:41:43 UTC (rev 164711)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx">
</span><span class="cx"> function startTrackMenuTest(testFunction)
</span><span class="cx"> {
</span><ins>+ internals.suspendAnimations();
+
</ins><span class="cx"> if (window.eventSender) {
</span><span class="cx"> consoleWrite("<br>*** Set the user language preference.");
</span><span class="cx"> run("internals.setUserPreferredLanguages(['en'])");
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrolscaptionstrackmenuhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-controls-captions-trackmenu.html (164710 => 164711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controls-captions-trackmenu.html 2014-02-26 09:02:20 UTC (rev 164710)
+++ trunk/LayoutTests/media/video-controls-captions-trackmenu.html 2014-02-26 09:41:43 UTC (rev 164711)
</span><span class="lines">@@ -12,6 +12,11 @@
</span><span class="cx">
</span><span class="cx"> function startTest()
</span><span class="cx"> {
</span><ins>+ trackListElement = getTrackListElement();
+ if (!trackListElement)
+ return;
+ testExpected("trackListElement.offsetHeight", 0, ">");
+
</ins><span class="cx"> consoleWrite("<br>*** Add another text track.");
</span><span class="cx"> run('video.addTextTrack("captions", "Commentary", "ru")');
</span><span class="cx"> showTrackMenu()
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164710 => 164711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-26 09:02:20 UTC (rev 164710)
+++ trunk/Source/WebCore/ChangeLog 2014-02-26 09:41:43 UTC (rev 164711)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-26 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Regression when showing the captions menu
+ https://bugs.webkit.org/show_bug.cgi?id=129106
+
+ Reviewed by Martin Robinson.
+
+ In some cases, when clicking the captions button the menu was not
+ shown.
+
+ Updated test: media/video-controls-captions-trackmenu.html
+
+ * Modules/mediacontrols/mediaControlsGtk.js:
+ (ControllerGtk.prototype.buildCaptionMenu):
+ (ControllerGtk.prototype.showCaptionMenu): Specify sizes in
+ pixels.
+
</ins><span class="cx"> 2014-02-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Avoid unnecessary HTML Collection invalidations for id and name attribute changes
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (164710 => 164711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-02-26 09:02:20 UTC (rev 164710)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-02-26 09:41:43 UTC (rev 164711)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> // Caption menu has to be centered to the caption button.
</span><span class="cx"> var captionButtonCenter = this.controls.panel.offsetLeft + this.controls.captionButton.offsetLeft +
</span><span class="cx"> this.controls.captionButton.offsetWidth / 2;
</span><del>- this.captionMenu.style.left = (captionButtonCenter - this.captionMenu.offsetWidth / 2);
</del><ins>+ this.captionMenu.style.left = (captionButtonCenter - this.captionMenu.offsetWidth / 2) + 'px';
</ins><span class="cx"> // As height is not in the css, it needs to be specified to animate it.
</span><span class="cx"> this.captionMenu.height = this.captionMenu.offsetHeight;
</span><span class="cx"> this.captionMenu.style.height = 0;
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> showCaptionMenu: function()
</span><span class="cx"> {
</span><del>- this.captionMenu.style.height = this.captionMenu.height;
</del><ins>+ this.captionMenu.style.height = this.captionMenu.height + 'px';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hideCaptionMenu: function()
</span></span></pre>
</div>
</div>
</body>
</html>