Diff
Modified: trunk/LayoutTests/ChangeLog (156663 => 156664)
--- trunk/LayoutTests/ChangeLog 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/ChangeLog 2013-09-30 17:56:35 UTC (rev 156664)
@@ -1,3 +1,17 @@
+2013-09-30 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed, roll back in r156546 with rebaselined tests.
+ https://bugs.webkit.org/show_bug.cgi?id=122111
+
+ * platform/mac/TestExpectations:
+ * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.png:
+ * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt:
+ * platform/mac/fast/layers/video-layer-expected.png:
+ * platform/mac/fast/layers/video-layer-expected.txt:
+ * platform/mac/media/media-controls-clone-expected.png:
+ * platform/mac/media/media-controls-clone-expected.txt:
+ * platform/mac/media/video-no-audio-expected.txt:
+
2013-09-30 Robert Plociennik <r.plocien...@samsung.com>
editing/execCommand/findString-diacriticals.html expects to fail
Modified: trunk/LayoutTests/platform/mac/TestExpectations (156663 => 156664)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-09-30 17:56:35 UTC (rev 156664)
@@ -1358,7 +1358,6 @@
webkit.org/b/122021 media/video-controls-visible-exiting-fullscreen.html
webkit.org/b/122021 media/video-display-toggle.html
webkit.org/b/122021 media/video-empty-source.html
-webkit.org/b/122021 media/video-no-audio.html
webkit.org/b/122021 media/video-rtl.html
webkit.org/b/122021 media/video-volume-slider.html
webkit.org/b/122021 media/volume-bar-empty-when-muted.html
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt (156663 => 156664)
--- trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2013-09-30 17:56:35 UTC (rev 156664)
@@ -18,13 +18,9 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (40,156) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,159) size 197x9
- RenderFlexibleBox {DIV} at (49,8) size 197x9
-layer at (59,159) size 193x9
- RenderFlexibleBox {DIV} at (2,0) size 193x9
-layer at (254,153) size 22x22
- RenderFlexibleBox {DIV} at (246,2) size 22x22
-layer at (257,156) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (57,159) size 221x9
+ RenderFlexibleBox {DIV} at (49,8) size 221x9
+layer at (59,159) size 217x9
+ RenderFlexibleBox {DIV} at (2,0) size 217x9
layer at (285,156) size 16x16
RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt (156663 => 156664)
--- trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2013-09-30 17:56:35 UTC (rev 156664)
@@ -23,13 +23,9 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (91,241) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (108,244) size 197x9
- RenderFlexibleBox {DIV} at (49,8) size 197x9
-layer at (110,244) size 193x9
- RenderFlexibleBox {DIV} at (2,0) size 193x9
-layer at (305,238) size 22x22
- RenderFlexibleBox {DIV} at (246,2) size 22x22
-layer at (308,241) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (108,244) size 221x9
+ RenderFlexibleBox {DIV} at (49,8) size 221x9
+layer at (110,244) size 217x9
+ RenderFlexibleBox {DIV} at (2,0) size 217x9
layer at (336,241) size 16x16
RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (156663 => 156664)
--- trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2013-09-30 17:56:35 UTC (rev 156664)
@@ -19,14 +19,10 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (40,138) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,141) size 197x9
- RenderFlexibleBox {DIV} at (49,8) size 197x9
-layer at (59,141) size 193x9
- RenderFlexibleBox {DIV} at (2,0) size 193x9
-layer at (254,135) size 22x22
- RenderFlexibleBox {DIV} at (246,2) size 22x22
-layer at (257,138) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (57,141) size 221x9
+ RenderFlexibleBox {DIV} at (49,8) size 221x9
+layer at (59,141) size 217x9
+ RenderFlexibleBox {DIV} at (2,0) size 217x9
layer at (285,138) size 16x16
RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
layer at (308,133) size 200x25
@@ -37,14 +33,10 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (340,138) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (357,141) size 127x9
- RenderFlexibleBox {DIV} at (49,8) size 127x9
-layer at (359,141) size 123x9
- RenderFlexibleBox {DIV} at (2,0) size 123x9
-layer at (484,135) size 22x22
- RenderFlexibleBox {DIV} at (176,2) size 22x22
-layer at (487,138) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (357,141) size 151x9
+ RenderFlexibleBox {DIV} at (49,8) size 151x9
+layer at (359,141) size 147x9
+ RenderFlexibleBox {DIV} at (2,0) size 147x9
layer at (8,162) size 300x150
RenderFlexibleBox {DIV} at (0,0) size 300x150
layer at (8,287) size 300x25
@@ -53,14 +45,10 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (40,292) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,295) size 197x9
- RenderFlexibleBox {DIV} at (49,8) size 197x9
-layer at (59,295) size 193x9
- RenderFlexibleBox {DIV} at (2,0) size 193x9
-layer at (254,289) size 22x22
- RenderFlexibleBox {DIV} at (246,2) size 22x22
-layer at (257,292) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (57,295) size 221x9
+ RenderFlexibleBox {DIV} at (49,8) size 221x9
+layer at (59,295) size 217x9
+ RenderFlexibleBox {DIV} at (2,0) size 217x9
layer at (285,292) size 16x16
RenderButton {BUTTON} at (277,5) size 16x16 [color=#FFFFFF]
layer at (308,287) size 200x25
@@ -71,11 +59,7 @@
RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
layer at (340,292) size 16x16
RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (357,295) size 127x9
- RenderFlexibleBox {DIV} at (49,8) size 127x9
-layer at (359,295) size 123x9
- RenderFlexibleBox {DIV} at (2,0) size 123x9
-layer at (484,289) size 22x22
- RenderFlexibleBox {DIV} at (176,2) size 22x22
-layer at (487,292) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (357,295) size 151x9
+ RenderFlexibleBox {DIV} at (49,8) size 151x9
+layer at (359,295) size 147x9
+ RenderFlexibleBox {DIV} at (2,0) size 147x9
Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt (156663 => 156664)
--- trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2013-09-30 17:56:35 UTC (rev 156664)
@@ -14,22 +14,28 @@
RenderFlexibleBox {DIV} at (0,0) size 352x288
layer at (8,305) size 352x25
RenderFlexibleBox {DIV} at (0,263) size 352x25
- RenderButton {INPUT} at (6,3) size 18x18
- RenderButton {INPUT} at (32,4) size 16x16
- RenderFlexibleBox {DIV} at (49,5) size 273x15
- RenderSlider {INPUT} at (45,2) size 183x13
- RenderFlexibleBox {DIV} at (0,0) size 183x13
- RenderBlock {DIV} at (0,2) size 183x8
- RenderBlock {DIV} at (0,0) size 10x8
- RenderButton {INPUT} at (329,4) size 16x16
- RenderBlock {DIV} at (322,12) size 0x0
+layer at (14,309) size 16x16
+ RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF]
+layer at (40,310) size 16x16
+ RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,312) size 273x11
+ RenderFlexibleBox {DIV} at (49,7) size 273x11
layer at (57,312) size 45x11
- RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
+ RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (285,312) size 45x11
- RenderFlexibleBox {DIV} at (228,2) size 45x11 [color=#FFFFFF]
+ RenderFlexibleBox {DIV} at (228,0) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:09"
+layer at (104,313) size 179x9
+ RenderFlexibleBox {DIV} at (47,1) size 179x9
+ RenderSlider {INPUT} at (0,0) size 179x9 [color=#909090] [bgcolor=#000000]
+ RenderFlexibleBox {DIV} at (0,0) size 179x9
+ RenderBlock {DIV} at (0,1) size 179x6
+layer at (104,314) size 6x6
+ RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (337,310) size 16x16
+ RenderButton {BUTTON} at (329,5) size 16x16 [color=#FFFFFF]
Modified: trunk/Source/WebCore/ChangeLog (156663 => 156664)
--- trunk/Source/WebCore/ChangeLog 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/Source/WebCore/ChangeLog 2013-09-30 17:56:35 UTC (rev 156664)
@@ -1,3 +1,14 @@
+2013-09-30 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed, roll back in r156546 with rebaselined tests.
+ https://bugs.webkit.org/show_bug.cgi?id=122111
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller):
+ (Controller.prototype.addVideoListeners):
+ (Controller.prototype.removeVideoListeners):
+ (Controller.prototype.updateHasAudio):
+
2013-09-30 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r156656.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (156663 => 156664)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2013-09-30 17:38:02 UTC (rev 156663)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2013-09-30 17:56:35 UTC (rev 156664)
@@ -25,6 +25,7 @@
this.updateCaptionButton();
this.updateCaptionContainer();
this.updateVolume();
+ this.updateHasAudio();
};
/* Enums */
@@ -112,6 +113,11 @@
this.listenFor(this.video.textTracks, 'addtrack', this.handleTextTrackAdd);
this.listenFor(this.video.textTracks, 'removetrack', this.handleTextTrackRemove);
+ /* audio tracks */
+ this.listenFor(this.video.audioTracks, 'change', this.updateHasAudio);
+ this.listenFor(this.video.audioTracks, 'addtrack', this.updateHasAudio);
+ this.listenFor(this.video.audioTracks, 'removetrack', this.updateHasAudio);
+
/* controls attribute */
this.controlsObserver = new MutationObserver(this.handleControlsChange.bind(this));
this.controlsObserver.observe(this.video, { attributes: true, attributeFilter: ['controls'] });
@@ -128,6 +134,11 @@
this.stopListeningFor(this.video.textTracks, 'addtrack', this.handleTextTrackAdd);
this.stopListeningFor(this.video.textTracks, 'removetrack', this.handleTextTrackRemove);
+ /* audio tracks */
+ this.stopListeningFor(this.video.audioTracks, 'change', this.updateHasAudio);
+ this.stopListeningFor(this.video.audioTracks, 'addtrack', this.updateHasAudio);
+ this.stopListeningFor(this.video.audioTracks, 'removetrack', this.updateHasAudio);
+
/* controls attribute */
this.controlsObserver.disconnect();
delete(this.controlsObserver);
@@ -914,6 +925,14 @@
delete this.captionMenuItems;
},
+ updateHasAudio: function()
+ {
+ if (this.video.audioTracks.length)
+ this.controls.muteBox.classList.remove(this.ClassNames.hidden);
+ else
+ this.controls.muteBox.classList.add(this.ClassNames.hidden);
+ },
+
updateVolume: function()
{
if (this.video.muted || !this.video.volume) {