Diff
Modified: trunk/LayoutTests/ChangeLog (121042 => 121043)
--- trunk/LayoutTests/ChangeLog 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/ChangeLog 2012-06-22 18:25:08 UTC (rev 121043)
@@ -1,3 +1,13 @@
+2012-06-22 Silvia Pfeiffer <[email protected]>
+
+ [Chromium] Adjust the displayed elements of the new Chrome media controls.
+ https://bugs.webkit.org/show_bug.cgi?id=89416
+
+ Reviewed by Eric Carlson.
+
+ * platform/chromium/TestExpectations:
+ Skipping a test temporarily for win and mac until rebaseline.
+
2012-06-22 Florin Malita <[email protected]>
REGRESSION (Safari 5.1.5 - ToT): Crash in RenderSVGRoot::computeReplacedLogicalWidth
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (121042 => 121043)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-22 18:25:08 UTC (rev 121043)
@@ -2998,6 +2998,7 @@
BUGWK89696 WIN MAC : fast/layers/video-layer.html = IMAGE IMAGE+TEXT
BUGWK89696 WIN MAC : fullscreen/full-screen-stacking-context.html = IMAGE
BUGWK89696 WIN MAC : http/tests/media/video-buffered-range-contains-currentTime.html = IMAGE
+BUGWK89416 WIN MAC : media/video-empty-source.html = IMAGE IMAGE+TEXT
BUGWK72271 SNOWLEOPARD DEBUG : fast/dom/node-iterator-reference-node-moved-crash.html = PASS CRASH
Modified: trunk/LayoutTests/platform/chromium-linux/fast/layers/video-layer-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/fullscreen/full-screen-stacking-context-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/audio-controls-rendering-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/audio-repaint-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/controls-layout-direction-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/media-controls-clone-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/video-empty-source-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-linux/media/video-no-audio-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/fast/layers/video-layer-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -22,23 +22,15 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 81x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 81x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 61x24
- RenderBlock {DIV} at (55,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (144,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 152x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 132x24
+ RenderBlock {DIV} at (126,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (178,0) size 41x30
+ RenderBlock (anonymous) at (249,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (219,11) size 22x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 22x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 10x24
- RenderBlock {DIV} at (4,1) size 24x24
- RenderBlock (anonymous) at (256,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
layer at (106,233) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (287,233) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
Modified: trunk/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/media/audio-controls-rendering-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -21,25 +21,23 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 103x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 83x24
+ RenderBlock {DIV} at (77,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:07"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (200,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
+ RenderSlider {INPUT} at (241,11) size 44x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 32x24
+ RenderBlock {DIV} at (26,1) size 24x24
layer at (50,47) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (241,47) size 24x24
+layer at (275,47) size 24x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (8,94) size 320x30
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30
@@ -48,25 +46,23 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 96x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 96x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 76x24
- RenderBlock {DIV} at (70,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (159,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 113x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 93x24
+ RenderBlock {DIV} at (87,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:07"
- RenderBlock (anonymous) at (193,0) size 41x30
+ RenderBlock (anonymous) at (210,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (234,11) size 37x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 37x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 25x24
- RenderBlock {DIV} at (19,1) size 24x24
- RenderBlock (anonymous) at (286,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
+ RenderSlider {INPUT} at (251,11) size 54x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 42x24
+ RenderBlock {DIV} at (36,1) size 24x24
layer at (50,97) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (261,97) size 24x24
+layer at (295,97) size 24x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (8,144) size 320x100
RenderMedia {AUDIO} at (8,144) size 320x100 [bgcolor=#0000FF]
@@ -77,23 +73,21 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 96x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 96x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 76x24
- RenderBlock {DIV} at (70,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (159,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 113x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 113x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 93x24
+ RenderBlock {DIV} at (87,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (176,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:07"
- RenderBlock (anonymous) at (193,0) size 41x30
+ RenderBlock (anonymous) at (210,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (234,11) size 37x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 37x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 25x24
- RenderBlock {DIV} at (19,1) size 24x24
- RenderBlock (anonymous) at (286,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
+ RenderSlider {INPUT} at (251,11) size 54x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 54x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 42x24
+ RenderBlock {DIV} at (36,1) size 24x24
layer at (50,217) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (261,217) size 24x24
+layer at (295,217) size 24x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
Modified: trunk/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/media/audio-repaint-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -21,25 +21,23 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 103x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 83x24
+ RenderBlock {DIV} at (77,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (200,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
-layer at (83,77) size 32x24
+ RenderSlider {INPUT} at (241,11) size 44x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 32x24
+ RenderBlock {DIV} at (26,1) size 24x24
+layer at (91,77) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (241,77) size 24x24
+layer at (275,77) size 24x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (8,44) size 300x30
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
@@ -48,25 +46,23 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 103x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 83x24
+ RenderBlock {DIV} at (77,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (200,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
-layer at (83,47) size 32x24
+ RenderSlider {INPUT} at (241,11) size 44x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 32x24
+ RenderBlock {DIV} at (26,1) size 24x24
+layer at (91,47) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (241,47) size 24x24
+layer at (275,47) size 24x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (8,156) size 300x30
RenderMedia {AUDIO} at (0,112) size 300x30
@@ -77,19 +73,17 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 103x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 103x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 83x24
+ RenderBlock {DIV} at (77,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (166,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (200,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
+ RenderSlider {INPUT} at (241,11) size 44x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 44x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 32x24
+ RenderBlock {DIV} at (26,1) size 24x24
Modified: trunk/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/media/media-controls-clone-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -18,26 +18,18 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 81x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 81x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 61x24
- RenderBlock {DIV} at (55,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (144,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 152x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 132x24
+ RenderBlock {DIV} at (126,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (178,0) size 41x30
+ RenderBlock (anonymous) at (249,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (219,11) size 22x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 22x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 10x24
- RenderBlock {DIV} at (4,1) size 24x24
- RenderBlock (anonymous) at (256,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
layer at (55,126) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (236,126) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (308,128) size 300x30
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
RenderBlock {DIV} at (0,0) size 300x30
@@ -45,26 +37,18 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 162x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 142x24
+ RenderBlock {DIV} at (136,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (259,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
layer at (350,131) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (541,131) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (8,163) size 300x150
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
RenderBlock {DIV} at (0,115) size 300x35
@@ -72,26 +56,18 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 81x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 81x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 61x24
- RenderBlock {DIV} at (55,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (144,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 152x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 152x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 132x24
+ RenderBlock {DIV} at (126,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (215,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (178,0) size 41x30
+ RenderBlock (anonymous) at (249,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (219,11) size 22x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 22x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 10x24
- RenderBlock {DIV} at (4,1) size 24x24
- RenderBlock (anonymous) at (256,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
layer at (55,281) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (236,281) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
layer at (308,283) size 300x30
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30
RenderBlock {DIV} at (0,0) size 300x30
@@ -99,23 +75,15 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 86x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 86x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 66x24
- RenderBlock {DIV} at (60,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (149,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 162x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 162x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 142x24
+ RenderBlock {DIV} at (136,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (225,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (183,0) size 41x30
+ RenderBlock (anonymous) at (259,0) size 41x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (224,11) size 27x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 27x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 15x24
- RenderBlock {DIV} at (9,1) size 24x24
- RenderBlock (anonymous) at (266,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
layer at (350,286) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (541,286) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
Modified: trunk/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/media/video-empty-source-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -13,12 +13,18 @@
layer at (9,45) size 300x150
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (1,1) size 300x150
RenderBlock {DIV} at (0,115) size 300x35
-layer at (14,160) size 290x30
+layer at (14,160) size 290x30 scrollHeight 36
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 290x30 [bgcolor=#141414CC]
- RenderBlock (anonymous) at (104,0) size 48x30
+ RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderDeprecatedFlexibleBox {DIV} at (152,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 193x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 193x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 173x24
+ RenderBlock {DIV} at (167,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (256,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:00"
- RenderBlock (anonymous) at (186,15) size 0x0
+ RenderBlock (anonymous) at (290,15) size 0x0
+layer at (56,163) size 32x24
+ RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
Modified: trunk/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt (121042 => 121043)
--- trunk/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/LayoutTests/platform/chromium-win/media/video-no-audio-expected.txt 2012-06-22 18:25:08 UTC (rev 121043)
@@ -17,23 +17,16 @@
RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (5,0) size 342x30 [bgcolor=#141414CC]
RenderBlock (anonymous) at (0,0) size 48x30
RenderButton {INPUT} at (9,0) size 30x30
- RenderSlider {INPUT} at (48,11) size 107x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 107x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 87x24
- RenderBlock {DIV} at (81,1) size 32x24
- RenderDeprecatedFlexibleBox {DIV} at (170,0) size 25x30 [color=#FFFFFF]
+ RenderSlider {INPUT} at (48,11) size 170x8
+ RenderDeprecatedFlexibleBox {DIV} at (0,0) size 170x8 [border: (1px solid #E6E6E659)]
+ RenderBlock {DIV} at (1,1) size 150x24
+ RenderBlock {DIV} at (144,1) size 32x24
+ RenderDeprecatedFlexibleBox {DIV} at (233,0) size 25x30 [color=#FFFFFF]
RenderBlock (anonymous) at (0,0) size 25x30
RenderText {#text} at (0,7) size 25x16
text run at (0,7) width 25: "0:09"
- RenderBlock (anonymous) at (204,0) size 41x30
+ RenderBlock (anonymous) at (267,0) size 75x30
RenderButton {INPUT} at (0,0) size 35x30
- RenderSlider {INPUT} at (245,11) size 48x8
- RenderDeprecatedFlexibleBox {DIV} at (0,0) size 48x8 [border: (1px solid #E6E6E659)]
- RenderBlock {DIV} at (1,1) size 36x24
- RenderBlock {DIV} at (30,1) size 24x24
- RenderBlock (anonymous) at (308,0) size 34x30
- RenderButton {INPUT} at (-5,0) size 30x30
+ RenderButton {INPUT} at (36,0) size 30x30
layer at (55,300) size 32x24
RenderBlock (relative positioned) {DIV} at (-7,-8) size 32x24
-layer at (288,300) size 24x24
- RenderBlock (relative positioned) {DIV} at (-7,-8) size 24x24
Modified: trunk/Source/WebCore/ChangeLog (121042 => 121043)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 18:25:08 UTC (rev 121043)
@@ -1,3 +1,23 @@
+2012-06-22 Silvia Pfeiffer <[email protected]>
+
+ [Chromium] Adjust the displayed elements of the new Chrome media controls.
+ https://bugs.webkit.org/show_bug.cgi?id=89416
+
+ Reviewed by Eric Carlson.
+
+ No new tests - existing media tests cover these cases.
+
+ Remove the volume slider for videos without audio or media resource.
+ Display the transport bar for videos without a media resource.
+ Don't show the fullscreen button for
+
+ * html/shadow/MediaControlRootElementChromium.cpp:
+ (WebCore::MediaControlRootElementChromium::reset):
+ Don't display volume slider if media controller has no audio.
+ Don't display fullscreen button if media controller supportsFullscreen().
+ (WebCore::MediaControlRootElementChromium::reportedError):
+ Don't hide the timeline for failed videos, e.g. where the resource doesn't load.
+
2012-06-22 Alexander Pavlov <[email protected]>
Web Inspector: [Elements] Right-clicking on whitespace should show the same context menu as right-clicking on the tag text
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp (121042 => 121043)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-06-22 18:22:43 UTC (rev 121042)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-06-22 18:25:08 UTC (rev 121043)
@@ -236,11 +236,19 @@
m_panelMuteButton->show();
- if (m_volumeSlider)
- m_volumeSlider->setVolume(m_mediaController->volume());
+ if (m_volumeSlider) {
+ if (!m_mediaController->hasAudio())
+ m_volumeSlider->hide();
+ else {
+ m_volumeSlider->show();
+ m_volumeSlider->setVolume(m_mediaController->volume());
+ }
+ }
- m_fullscreenButton->show();
-
+ if (m_mediaController->supportsFullscreen())
+ m_fullscreenButton->show();
+ else
+ m_fullscreenButton->hide();
makeOpaque();
}
@@ -302,7 +310,6 @@
if (!page)
return;
- m_timeline->hide();
m_panelMuteButton->hide();
m_volumeSlider->hide();
m_fullscreenButton->hide();
