<!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>[164782] 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/164782">164782</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-02-27 01:16:18 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Improve JavaScript multimedia controls
https://bugs.webkit.org/show_bug.cgi?id=129044
Reviewed by Jer Noble.
Source/WebCore:
After webkit.org/b/123097 a follow up was needed to improve
accessibily and some other cosmetic problems, like cleaner CSS and
new missing baselines.
No new tests because of no new functionality.
* Modules/mediacontrols/mediaControlsApple.js:
Added hiding class name.
* Modules/mediacontrols/mediaControlsGtk.js:
(ControllerGtk.prototype.createControls): Set remaining time as
hidden by default and turned volumebox hidden into hiding.
(ControllerGtk.prototype.updateTime): Simplified the hiding and
showing by removing the show class and using hidden only.
(ControllerGtk.prototype.handleMuteButtonMouseOver):
(ControllerGtk.prototype.handleVolumeBoxMouseOut): Turned hidden
into hiding.
(ControllerGtk.prototype.updateReadyState): Changed coding style
and added down class for the panel too.
(ControllerGtk.prototype.updatePlaying): Change for coding style
coherence.
(ControllerGtk.prototype.handleCaptionButtonClicked): Call
handleCaptionButtonShowMenu.
(ControllerGtk.prototype.handleCaptionButtonMouseOver): Call
handleCaptionButtonShowMenu.
(ControllerGtk.prototype.handleCaptionButtonShowMenu): Created
with the former behavior of handleCaptionButtonMouseOver.
* css/mediaControlsGtk.css:
(.hidden): Set display none for all objects with hidden class.
(audio::-webkit-media-controls-panel *:focus):
(audio::-webkit-media-controls-panel.down *:focus): Added gradient
for the active and focus status.
(audio::-webkit-media-controls-time-remaining-display)
(video::-webkit-media-controls-time-remaining-display): Set
display block.
(audio::-webkit-media-controls-volume-slider-container)
(video::-webkit-media-controls-volume-slider-container): Set
display flex.
(video::-webkit-media-controls-volume-slider-container.hiding):
Changed from hidden.
(video::-webkit-media-controls-panel .hiding.down): Changed from
hidden.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMediaButton): Returning true to
allow CSS painting the gradient.
LayoutTests:
* media/controls-without-preload.html: Fixed.
* platform/gtk/accessibility/media-controls-panel-title-expected.txt:
* platform/gtk/accessibility/media-controls-panel-title.html:
* platform/gtk/accessibility/media-emits-object-replacement-expected.txt:
* platform/gtk/media/video-volume-slider-expected.png:
* platform/gtk/media/video-volume-slider-expected.txt:
* platform/gtk/media/video-zoom-controls-expected.txt: Rebaseline.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediacontrolswithoutpreloadhtml">trunk/LayoutTests/media/controls-without-preload.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymediacontrolspaneltitleexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymediacontrolspaneltitlehtml">trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymediaemitsobjectreplacementexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/media-emits-object-replacement-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedpng">trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt</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>
<li><a href="#trunkSourceWebCorecssmediaControlsGtkcss">trunk/Source/WebCore/css/mediaControlsGtk.css</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-27 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Improve JavaScript multimedia controls
+ https://bugs.webkit.org/show_bug.cgi?id=129044
+
+ Reviewed by Jer Noble.
+
+ * media/controls-without-preload.html: Fixed.
+ * platform/gtk/accessibility/media-controls-panel-title-expected.txt:
+ * platform/gtk/accessibility/media-controls-panel-title.html:
+ * platform/gtk/accessibility/media-emits-object-replacement-expected.txt:
+ * platform/gtk/media/video-volume-slider-expected.png:
+ * platform/gtk/media/video-volume-slider-expected.txt:
+ * platform/gtk/media/video-zoom-controls-expected.txt: Rebaseline.
+
</ins><span class="cx"> 2014-02-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Indenting an indented image element resulted in an extra indentation
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolswithoutpreloadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls-without-preload.html (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls-without-preload.html 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/media/controls-without-preload.html 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx">
</span><span class="cx"> function start()
</span><span class="cx"> {
</span><ins>+ internals.suspendAnimations();
</ins><span class="cx"> setSrcByTagName("video", findMediaFile("video", "content/test"));
</span><span class="cx"> video = document.getElementsByTagName('video')[0];
</span><span class="cx"> video.load();
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymediacontrolspaneltitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title-expected.txt (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title-expected.txt 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title-expected.txt 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -9,11 +9,11 @@
</span><span class="cx"> PASS element.role is 'AXRole: AXEmbedded'
</span><span class="cx"> PASS element.title is 'AXTitle: '
</span><span class="cx"> PASS element.role is 'AXRole: AXToolbar'
</span><del>-PASS element.title is 'AXTitle: video playback'
</del><ins>+PASS element.title is 'AXTitle: Video Playback'
</ins><span class="cx"> PASS element.role is 'AXRole: AXEmbedded'
</span><span class="cx"> PASS element.title is 'AXTitle: '
</span><span class="cx"> PASS element.role is 'AXRole: AXToolbar'
</span><del>-PASS element.title is 'AXTitle: audio playback'
</del><ins>+PASS element.title is 'AXTitle: Audio Playback'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymediacontrolspaneltitlehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title.html (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title.html 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/platform/gtk/accessibility/media-controls-panel-title.html 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> shouldBe("element.title", "'AXTitle: '");
</span><span class="cx"> element = element.childAtIndex(0);
</span><span class="cx"> shouldBe("element.role", "'AXRole: AXToolbar'");
</span><del>- shouldBe("element.title", "'AXTitle: video playback'");
</del><ins>+ shouldBe("element.title", "'AXTitle: Video Playback'");
</ins><span class="cx">
</span><span class="cx"> // Audio element.
</span><span class="cx"> element = mainBlock.childAtIndex(1);
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> shouldBe("element.title", "'AXTitle: '");
</span><span class="cx"> element = element.childAtIndex(0);
</span><span class="cx"> shouldBe("element.role", "'AXRole: AXToolbar'");
</span><del>- shouldBe("element.title", "'AXTitle: audio playback'");
</del><ins>+ shouldBe("element.title", "'AXTitle: Audio Playback'");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymediaemitsobjectreplacementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/media-emits-object-replacement-expected.txt (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/media-emits-object-replacement-expected.txt 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/platform/gtk/accessibility/media-emits-object-replacement-expected.txt 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -6,16 +6,16 @@
</span><span class="cx"> AXRole: AXSection AXValue: a <obj> b
</span><span class="cx"> AXRole: AXEmbedded
</span><span class="cx"> AXRole: AXToolbar
</span><del>- AXRole: AXToolbar
- AXRole: AXButton
- AXRole: AXSlider
</del><ins>+ AXRole: AXButton
+ AXRole: AXSlider
+ AXRole: AXTimer AXValue: 00:00
</ins><span class="cx"> AXRole: AXGroup AXValue: <\n>
</span><span class="cx"> AXRole: AXSection AXValue: a <obj> b
</span><span class="cx"> AXRole: AXEmbedded
</span><span class="cx"> AXRole: AXToolbar
</span><del>- AXRole: AXToolbar
- AXRole: AXButton
- AXRole: AXSlider
</del><ins>+ AXRole: AXButton
+ AXRole: AXSlider
+ AXRole: AXTimer AXValue: 00:00
</ins><span class="cx"> AXRole: AXSection AXValue: End of test
</span><span class="cx"> This tests ensures that if video or audio tags are used, they will emit an object replacement character in a range for string operation.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideovolumesliderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/platform/gtk/media/video-volume-slider-expected.txt 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -6,19 +6,19 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 433x17
</span><span class="cx"> text run at (0,0) width 433: "Tests if the volume slider is rendererd properly. This test assumes the"
</span><span class="cx"> RenderBR {BR} at (433,14) size 0x0
</span><del>- RenderText {#text} at (0,18) size 453x17
- text run at (0,18) width 453: "volume slider is implemented and mouse over the right bottom corner of"
- RenderBR {BR} at (453,32) size 0x0
- RenderText {#text} at (0,36) size 270x17
- text run at (0,36) width 270: "video element will show the volume slider."
- RenderBR {BR} at (270,50) size 0x0
</del><ins>+ RenderText {#text} at (0,17) size 453x17
+ text run at (0,17) width 453: "volume slider is implemented and mouse over the right bottom corner of"
+ RenderBR {BR} at (453,31) size 0x0
+ RenderText {#text} at (0,34) size 270x17
+ text run at (0,34) width 270: "video element will show the volume slider."
+ RenderBR {BR} at (270,48) size 0x0
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (8,62) size 320x240
- RenderVideo {VIDEO} at (0,54) size 320x240
-layer at (8,62) size 320x240
</del><ins>+layer at (8,59) size 320x240
+ RenderVideo {VIDEO} at (0,51) size 320x240
+layer at (8,59) size 320x240
</ins><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> RenderBlock {DIV} at (0,200) size 320x40
</span><del>-layer at (13,267) size 310x30
</del><ins>+layer at (13,264) size 310x30
</ins><span class="cx"> RenderFlexibleBox {DIV} at (5,5) size 310x30 [bgcolor=#141414CC]
</span><span class="cx"> RenderButton {BUTTON} at (9,0) size 30x30
</span><span class="cx"> RenderSlider {INPUT} at (49,11) size 135x8 [color=#E6E6E659]
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> RenderButton {BUTTON} at (239,0) size 30x30
</span><span class="cx"> RenderFlexibleBox {DIV} at (271,0) size 30x30
</span><span class="cx"> RenderButton {BUTTON} at (0,0) size 30x30
</span><del>-layer at (284,167) size 30x100
- RenderBlock (positioned) zI: 2 {DIV} at (271,-100) size 30x100 [bgcolor=#141414CC]
</del><ins>+layer at (284,164) size 30x100
+ RenderFlexibleBox zI: 2 {DIV} at (271,-100) size 30x100 [bgcolor=#141414CC]
</ins><span class="cx"> RenderSlider {INPUT} at (11,10) size 8x80 [color=#E6E6E659]
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 8x80 [border: (1px solid #E6E6E659)]
</span><span class="cx"> RenderBlock {DIV} at (-2,-6) size 12x92
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -15,8 +15,8 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (7,7) size 226x46 [bgcolor=#141414CC]
</span><span class="cx"> RenderButton {BUTTON} at (13,0) size 46x45
</span><span class="cx"> RenderSlider {INPUT} at (73,16) size 38x13 [color=#E6E6E659]
</span><del>- RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,-3) size 57x18
</del><ins>+ RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1.50px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,-3) size 56x18
</ins><span class="cx"> RenderBlock {DIV} at (-11,0) size 19x18 [color=#FFFFFF]
</span><span class="cx"> RenderBlock {DIV} at (133,0) size 109x45 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,11) size 108x22
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (7,7) size 226x46 [bgcolor=#141414CC]
</span><span class="cx"> RenderButton {BUTTON} at (13,0) size 46x45
</span><span class="cx"> RenderSlider {INPUT} at (73,16) size 38x13 [color=#E6E6E659]
</span><del>- RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,-3) size 57x18
</del><ins>+ RenderFlexibleBox {DIV} at (0,0) size 38x12 [border: (1.50px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,-3) size 56x18
</ins><span class="cx"> RenderBlock {DIV} at (-11,0) size 19x18 [color=#FFFFFF]
</span><span class="cx"> RenderBlock {DIV} at (133,0) size 109x45 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (0,11) size 108x22
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2014-02-27 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GTK] Improve JavaScript multimedia controls
+ https://bugs.webkit.org/show_bug.cgi?id=129044
+
+ Reviewed by Jer Noble.
+
+ After webkit.org/b/123097 a follow up was needed to improve
+ accessibily and some other cosmetic problems, like cleaner CSS and
+ new missing baselines.
+
+ No new tests because of no new functionality.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ Added hiding class name.
+ * Modules/mediacontrols/mediaControlsGtk.js:
+ (ControllerGtk.prototype.createControls): Set remaining time as
+ hidden by default and turned volumebox hidden into hiding.
+ (ControllerGtk.prototype.updateTime): Simplified the hiding and
+ showing by removing the show class and using hidden only.
+ (ControllerGtk.prototype.handleMuteButtonMouseOver):
+ (ControllerGtk.prototype.handleVolumeBoxMouseOut): Turned hidden
+ into hiding.
+ (ControllerGtk.prototype.updateReadyState): Changed coding style
+ and added down class for the panel too.
+ (ControllerGtk.prototype.updatePlaying): Change for coding style
+ coherence.
+ (ControllerGtk.prototype.handleCaptionButtonClicked): Call
+ handleCaptionButtonShowMenu.
+ (ControllerGtk.prototype.handleCaptionButtonMouseOver): Call
+ handleCaptionButtonShowMenu.
+ (ControllerGtk.prototype.handleCaptionButtonShowMenu): Created
+ with the former behavior of handleCaptionButtonMouseOver.
+ * css/mediaControlsGtk.css:
+ (.hidden): Set display none for all objects with hidden class.
+ (audio::-webkit-media-controls-panel *:focus):
+ (audio::-webkit-media-controls-panel.down *:focus): Added gradient
+ for the active and focus status.
+ (audio::-webkit-media-controls-time-remaining-display)
+ (video::-webkit-media-controls-time-remaining-display): Set
+ display block.
+ (audio::-webkit-media-controls-volume-slider-container)
+ (video::-webkit-media-controls-volume-slider-container): Set
+ display flex.
+ (video::-webkit-media-controls-volume-slider-container.hiding):
+ Changed from hidden.
+ (video::-webkit-media-controls-panel .hiding.down): Changed from
+ hidden.
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintMediaButton): Returning true to
+ allow CSS painting the gradient.
+
</ins><span class="cx"> 2014-02-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fixing the GTK build fix after r164757.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> ClassNames: {
</span><span class="cx"> exit: 'exit',
</span><span class="cx"> hidden: 'hidden',
</span><ins>+ hiding: 'hiding',
</ins><span class="cx"> list: 'list',
</span><span class="cx"> muteBox: 'mute-box',
</span><span class="cx"> muted: 'muted',
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsGtkjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -24,9 +24,10 @@
</span><span class="cx"> Controller.prototype.createControls.apply(this);
</span><span class="cx">
</span><span class="cx"> this.controls.currentTime.classList.add(this.ClassNames.hidden);
</span><ins>+ this.controls.remainingTime.classList.add(this.ClassNames.hidden);
</ins><span class="cx">
</span><span class="cx"> this.controls.volumeBox.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container');
</span><del>- this.controls.volumeBox.classList.add(this.ClassNames.hidden);
</del><ins>+ this.controls.volumeBox.classList.add(this.ClassNames.hiding);
</ins><span class="cx">
</span><span class="cx"> this.listenFor(this.controls.muteBox, 'mouseout', this.handleVolumeBoxMouseOut);
</span><span class="cx"> this.listenFor(this.controls.muteButton, 'mouseover', this.handleMuteButtonMouseOver);
</span><span class="lines">@@ -65,12 +66,13 @@
</span><span class="cx">
</span><span class="cx"> this.controls.currentTime.innerText = this.formatTime(currentTime);
</span><span class="cx"> this.controls.timeline.value = currentTime;
</span><del>- if (duration === Infinity || duration === NaN) {
- this.controls.remainingTime.classList.remove(this.ClassNames.show);
- } else {
</del><ins>+ if (duration === Infinity || duration === NaN)
+ this.controls.remainingTime.classList.add(this.ClassNames.hidden);
+ else {
</ins><span class="cx"> this.controls.currentTime.innerText += " / " + this.formatTime(duration);
</span><span class="cx"> this.controls.remainingTime.innerText = this.formatTime(duration);
</span><del>- this.controls.remainingTime.classList.add(this.ClassNames.show);
</del><ins>+ if (this.controls.currentTime.classList.contains(this.ClassNames.hidden))
+ this.controls.remainingTime.classList.remove(this.ClassNames.hidden);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (currentTime > 0)
</span><span class="lines">@@ -96,12 +98,12 @@
</span><span class="cx">
</span><span class="cx"> handleMuteButtonMouseOver: function(event)
</span><span class="cx"> {
</span><del>- this.controls.volumeBox.classList.remove(this.ClassNames.hidden);
</del><ins>+ this.controls.volumeBox.classList.remove(this.ClassNames.hiding);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleVolumeBoxMouseOut: function(event)
</span><span class="cx"> {
</span><del>- this.controls.volumeBox.classList.add(this.ClassNames.hidden);
</del><ins>+ this.controls.volumeBox.classList.add(this.ClassNames.hiding);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addControls: function()
</span><span class="lines">@@ -111,15 +113,17 @@
</span><span class="cx">
</span><span class="cx"> updateReadyState: function()
</span><span class="cx"> {
</span><del>- if (this.host.supportsFullscreen && this.video.videoTracks.length) {
</del><ins>+ if (this.host.supportsFullscreen && this.video.videoTracks.length)
</ins><span class="cx"> this.controls.fullscreenButton.classList.remove(this.ClassNames.hidden);
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> this.controls.fullscreenButton.classList.add(this.ClassNames.hidden);
</span><del>- }
- if (this.video.offsetTop + this.controls.enclosure.offsetTop < 105)
</del><ins>+ if (this.video.offsetTop + this.controls.enclosure.offsetTop < 105) {
</ins><span class="cx"> this.controls.volumeBox.classList.add(this.ClassNames.down);
</span><del>- else
</del><ins>+ this.controls.panel.classList.add(this.ClassNames.down);
+ } else {
</ins><span class="cx"> this.controls.volumeBox.classList.remove(this.ClassNames.down);
</span><ins>+ this.controls.panel.classList.remove(this.ClassNames.down);
+ }
</ins><span class="cx"> this.updateVolume();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -135,14 +139,13 @@
</span><span class="cx"> updatePlaying: function()
</span><span class="cx"> {
</span><span class="cx"> Controller.prototype.updatePlaying.apply(this, arguments);
</span><del>- if (!this.canPlay()) {
</del><ins>+ if (!this.canPlay())
</ins><span class="cx"> this.showControls();
</span><del>- }
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleCaptionButtonClicked: function(event)
</span><span class="cx"> {
</span><del>- // Handled with mouseover and mouseout.
</del><ins>+ this.handleCaptionButtonShowMenu(event)
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> buildCaptionMenu: function()
</span><span class="lines">@@ -186,6 +189,11 @@
</span><span class="cx">
</span><span class="cx"> handleCaptionButtonMouseOver: function(event)
</span><span class="cx"> {
</span><ins>+ this.handleCaptionButtonShowMenu(event);
+ },
+
+ handleCaptionButtonShowMenu: function(event)
+ {
</ins><span class="cx"> if (!this.captionMenu)
</span><span class="cx"> this.buildCaptionMenu();
</span><span class="cx"> if (!contains(this.captionMenu.captionMenuTreeElements, event.relatedTarget))
</span></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlsGtkcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mediaControlsGtk.css (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControlsGtk.css 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/Source/WebCore/css/mediaControlsGtk.css 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -27,6 +27,22 @@
</span><span class="cx">
</span><span class="cx"> /* These are based on the Chromium media controls */
</span><span class="cx">
</span><ins>+.hidden {
+ display: none !important;
+}
+
+video::-webkit-media-controls-panel *:active,
+video::-webkit-media-controls-panel *:focus,
+audio::-webkit-media-controls-panel *:active,
+audio::-webkit-media-controls-panel *:focus {
+ background-image: linear-gradient(rgba(0, 0, 0, .05), rgba(255, 255, 255, .05)) !important;
+}
+
+audio::-webkit-media-controls-panel.down *:active,
+audio::-webkit-media-controls-panel.down *:focus {
+ background-image: linear-gradient(rgba(255, 255, 255, .05), rgba(0, 0, 0, .05)) !important;
+}
+
</ins><span class="cx"> body:-webkit-full-page-media {
</span><span class="cx"> background-color: rgb(0, 0, 0);
</span><span class="cx"> }
</span><span class="lines">@@ -86,6 +102,9 @@
</span><span class="cx"> opacity: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-panel,
+video:-webkit-full-page-media::-webkit-media-controls-panel.no-video,
+video::-webkit-media-controls-panel:hover,
</ins><span class="cx"> video::-webkit-media-controls-panel.show,
</span><span class="cx"> video::-webkit-media-controls-panel.paused {
</span><span class="cx"> opacity: 1;
</span><span class="lines">@@ -101,11 +120,6 @@
</span><span class="cx"> margin: 0 9px 0 -7px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-panel div.mute-box.hidden,
-audio::-webkit-media-controls-panel div.mute-box.hidden {
- display: none;
-}
-
</del><span class="cx"> audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
</span><span class="cx"> -webkit-appearance: media-mute-button;
</span><span class="cx"> display: -webkit-flex;
</span><span class="lines">@@ -136,6 +150,7 @@
</span><span class="cx"> -webkit-appearance: media-current-time-display;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -webkit-flex: none;
</span><ins>+ display: block;
</ins><span class="cx"> border: none;
</span><span class="cx"> cursor: default;
</span><span class="cx">
</span><span class="lines">@@ -157,27 +172,6 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
- display: block;
-}
-
-audio::-webkit-media-controls-time-remaining-display,
-video::-webkit-media-controls-time-remaining-display {
- display: none;
-}
-
-audio::-webkit-media-controls-time-remaining-display.show,
-video::-webkit-media-controls-time-remaining-display.show {
- display: block;
-}
-
-audio::-webkit-media-controls-current-time-display.hidden,
-video::-webkit-media-controls-current-time-display.hidden,
-audio::-webkit-media-controls-time-remaining-display.hidden,
-video::-webkit-media-controls-time-remaining-display.hidden {
- display: none;
-}
-
</del><span class="cx"> audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
</span><span class="cx"> -webkit-appearance: media-slider;
</span><span class="cx"> display: -webkit-flex;
</span><span class="lines">@@ -194,6 +188,7 @@
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
</span><span class="cx"> -webkit-appearance: media-volume-slider-container;
</span><ins>+ display: -webkit-flex;
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> position: absolute;
</span><span class="cx"> padding: 0;
</span><span class="lines">@@ -207,8 +202,8 @@
</span><span class="cx"> transition: height 0.10s linear;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-volume-slider-container.hidden,
-video::-webkit-media-controls-volume-slider-container.hidden {
</del><ins>+audio::-webkit-media-controls-volume-slider-container.hiding,
+video::-webkit-media-controls-volume-slider-container.hiding {
</ins><span class="cx"> height: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,8 +214,8 @@
</span><span class="cx"> transition: height 0.10s linear, bottom 0.10s linear;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-panel .hidden.down,
-video::-webkit-media-controls-panel .hidden.down {
</del><ins>+audio::-webkit-media-controls-panel .hiding.down,
+video::-webkit-media-controls-panel .hiding.down {
</ins><span class="cx"> bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -354,8 +349,3 @@
</span><span class="cx"> margin: 0 9px 0 -7px;
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><del>-
-video::-webkit-media-controls-panel button.hidden,
-audio::-webkit-media-controls-panel button.hidden {
- display: none;
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (164781 => 164782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-27 08:45:57 UTC (rev 164781)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-27 09:16:18 UTC (rev 164782)
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = getStockSymbolicIconForWidgetType(GTK_TYPE_CONTAINER, symbolicIconName, fallbackStockIconName,
</span><span class="cx"> gtkTextDirection(renderObject->style().direction()), gtkIconState(this, renderObject), iconRect.width());
</span><span class="cx"> paintGdkPixbuf(context, icon.get(), iconRect);
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderThemeGtk::hasOwnDisabledStateHandlingFor(ControlPart part) const
</span></span></pre>
</div>
</div>
</body>
</html>