<!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>[166227] 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/166227">166227</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-03-25 02:10:32 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Volume slider shows below the panel with videos in certain cases
https://bugs.webkit.org/show_bug.cgi?id=130608
Reviewed by Jer Noble.
Source/WebCore:
We need to delay the moment we check if the volume slider shows up
or down. If the video was not visible, the offsets were 0 and it
was forced to be shown below the panel.
Test: media/video-initially-hidden-volume-slider-up.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.createControls): Moved volumebox pseudo from
the subclass. The test checks for it and it would fail in Mac.
* Modules/mediacontrols/mediaControlsGtk.js:
(ControllerGtk.prototype.createControls): Moved volumebox pseudo
to the superclass.
(ControllerGtk.prototype.handleMuteButtonMouseOver): Check if
volume slider should show up or down.
(ControllerGtk.prototype.updateReadyState): Removed check for
volume slider direction.
LayoutTests:
* media/video-initially-hidden-volume-slider-up-expected.txt: Added.
* media/video-initially-hidden-volume-slider-up.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideoinitiallyhiddenvolumesliderupexpectedtxt">trunk/LayoutTests/media/video-initially-hidden-volume-slider-up-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideoinitiallyhiddenvolumeslideruphtml">trunk/LayoutTests/media/video-initially-hidden-volume-slider-up.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166226 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-25 07:13:20 UTC (rev 166226)
+++ trunk/LayoutTests/ChangeLog 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-25 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Volume slider shows below the panel with videos in certain cases
+ https://bugs.webkit.org/show_bug.cgi?id=130608
+
+ Reviewed by Jer Noble.
+
+ * media/video-initially-hidden-volume-slider-up-expected.txt: Added.
+ * media/video-initially-hidden-volume-slider-up.html: Added.
+
</ins><span class="cx"> 2014-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enable WebVTT Regions on Windows.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideoinitiallyhiddenvolumesliderupexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-initially-hidden-volume-slider-up-expected.txt (0 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-initially-hidden-volume-slider-up-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-initially-hidden-volume-slider-up-expected.txt 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+EXPECTED (volumeSliderCoordinates[0] <= muteButtonCoordinates[0] && volumeSliderCoordinates[1] <= muteButtonCoordinates[1] == 'true') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideoinitiallyhiddenvolumeslideruphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-initially-hidden-volume-slider-up.html (0 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-initially-hidden-volume-slider-up.html (rev 0)
+++ trunk/LayoutTests/media/video-initially-hidden-volume-slider-up.html 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <title>Test that volume slider is rendered up. </title>
+
+ <head>
+
+ <script src=video-test.js></script>
+ <script src=media-file.js></script>
+ <script src=media-controls.js></script>
+
+ <script>
+ var video;
+
+ var muteButtonCoordinates;
+ var volumeSliderCoordinates;
+
+ function test()
+ {
+ video.style.display = "block";
+
+ // Test that the volume slider is rendered correctly if video is brought to foreground
+
+ if (window.eventSender) {
+ // Move mouse on top of the mute button
+
+ try {
+ muteButtonCoordinates = mediaControlsButtonCoordinates(video, "mute-button");
+ } catch (exception) {
+ consoleWrite("ERROR: unable to get controls coordinates.");
+
+ failTest();
+ return;
+ }
+
+ eventSender.mouseMoveTo(muteButtonCoordinates[0], muteButtonCoordinates[1]);
+ }
+
+ // Ensure layout is done after mouse move
+ document.body.offsetTop;
+ try {
+ volumeSliderCoordinates = mediaControlsButtonCoordinates(video, "volume-slider-container");
+ } catch (exception) {
+ consoleWrite("ERROR: unable to get controls coordinates.");
+
+ failTest();
+ return;
+ }
+
+ // The volume slider should not be positioned below the panel
+ testExpected("volumeSliderCoordinates[0] <= muteButtonCoordinates[0] && volumeSliderCoordinates[1] <= muteButtonCoordinates[1]", true);
+
+ endTest();
+ }
+
+ function initialize()
+ {
+ internals.suspendAnimations();
+ video = document.getElementsByTagName("video")[0];
+ video.src = findMediaFile("video", "content/test");
+ }
+ </script>
+ </head>
+
+ <body onload="initialize();">
+ <video controls oncanplay="test();" style="display: none;"></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166226 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 07:13:20 UTC (rev 166226)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-25 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Volume slider shows below the panel with videos in certain cases
+ https://bugs.webkit.org/show_bug.cgi?id=130608
+
+ Reviewed by Jer Noble.
+
+ We need to delay the moment we check if the volume slider shows up
+ or down. If the video was not visible, the offsets were 0 and it
+ was forced to be shown below the panel.
+
+ Test: media/video-initially-hidden-volume-slider-up.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls): Moved volumebox pseudo from
+ the subclass. The test checks for it and it would fail in Mac.
+ * Modules/mediacontrols/mediaControlsGtk.js:
+ (ControllerGtk.prototype.createControls): Moved volumebox pseudo
+ to the superclass.
+ (ControllerGtk.prototype.handleMuteButtonMouseOver): Check if
+ volume slider should show up or down.
+ (ControllerGtk.prototype.updateReadyState): Removed check for
+ volume slider direction.
+
</ins><span class="cx"> 2014-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enable WebVTT Regions on Windows.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (166226 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-03-25 07:13:20 UTC (rev 166226)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -367,6 +367,7 @@
</span><span class="cx"> this.listenFor(maxButton, 'click', this.handleMaxButtonClicked);
</span><span class="cx">
</span><span class="cx"> var volumeBox = this.controls.volumeBox = document.createElement('div');
</span><ins>+ volumeBox.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container');
</ins><span class="cx"> volumeBox.classList.add(this.ClassNames.volumeBox);
</span><span class="cx">
</span><span class="cx"> var volume = this.controls.volume = document.createElement('input');
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (166226 => 166227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-03-25 07:13:20 UTC (rev 166226)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-03-25 09:10:32 UTC (rev 166227)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> this.controls.currentTime.classList.add(this.ClassNames.hidden);
</span><span class="cx"> this.controls.remainingTime.classList.add(this.ClassNames.hidden);
</span><span class="cx">
</span><del>- this.controls.volumeBox.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container');
</del><span class="cx"> this.controls.volumeBox.classList.add(this.ClassNames.hiding);
</span><span class="cx">
</span><span class="cx"> this.listenFor(this.controls.muteBox, 'mouseout', this.handleVolumeBoxMouseOut);
</span><span class="lines">@@ -98,6 +97,13 @@
</span><span class="cx">
</span><span class="cx"> handleMuteButtonMouseOver: function(event)
</span><span class="cx"> {
</span><ins>+ if (this.video.offsetTop + this.controls.enclosure.offsetTop < 105) {
+ this.controls.volumeBox.classList.add(this.ClassNames.down);
+ this.controls.panel.classList.add(this.ClassNames.down);
+ } else {
+ this.controls.volumeBox.classList.remove(this.ClassNames.down);
+ this.controls.panel.classList.remove(this.ClassNames.down);
+ }
</ins><span class="cx"> this.controls.volumeBox.classList.remove(this.ClassNames.hiding);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -117,13 +123,6 @@
</span><span class="cx"> this.controls.fullscreenButton.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> else
</span><span class="cx"> this.controls.fullscreenButton.classList.add(this.ClassNames.hidden);
</span><del>- if (this.video.offsetTop + this.controls.enclosure.offsetTop < 105) {
- this.controls.volumeBox.classList.add(this.ClassNames.down);
- this.controls.panel.classList.add(this.ClassNames.down);
- } else {
- this.controls.volumeBox.classList.remove(this.ClassNames.down);
- this.controls.panel.classList.remove(this.ClassNames.down);
- }
</del><span class="cx"> this.updateVolume();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>