Diff
Modified: trunk/LayoutTests/ChangeLog (120738 => 120739)
--- trunk/LayoutTests/ChangeLog 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/ChangeLog 2012-06-19 18:25:01 UTC (rev 120739)
@@ -1,3 +1,15 @@
+2012-06-19 Simon Fraser <simon.fra...@apple.com>
+
+ Rebaseline some media controller tests.
+
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/controls-strict-expected.txt:
+ * platform/mac/media/video-controls-rendering-expected.txt:
+ * platform/mac/media/video-display-toggle-expected.txt:
+ * platform/mac/media/video-no-audio-expected.txt:
+ * platform/mac/media/video-playing-and-pause-expected.txt:
+
2012-06-19 Abhishek Arya <infe...@chromium.org>
Crash in RenderInline::willBeDestroyed.
Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -23,10 +23,11 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
RenderSlider {INPUT} at (0,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderBlock {DIV} at (175,6) size 25x12
+layer at (57,51) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (185,48) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
layer at (8,85) size 320x25
@@ -38,9 +39,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 156x13
- RenderBlock {DIV} at (0,0) size 146x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (146,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 146x8
+ RenderBlock {DIV} at (146,2) size 10x8
RenderBlock {DIV} at (295,6) size 25x12
layer at (57,92) size 45x11
RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
@@ -52,6 +52,8 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:07"
+layer at (102,94) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (305,91) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
layer at (8,128) size 320x100
@@ -65,9 +67,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
RenderSlider {INPUT} at (45,2) size 156x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 156x13
- RenderBlock {DIV} at (0,0) size 146x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (146,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 146x8
+ RenderBlock {DIV} at (146,2) size 10x8
RenderBlock {DIV} at (295,6) size 25x12
layer at (57,210) size 45x11
RenderDeprecatedFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
@@ -79,5 +80,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:07"
+layer at (102,212) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (305,209) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -19,9 +19,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,264) size 45x11
@@ -34,5 +33,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,266) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,263) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
Modified: trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -19,9 +19,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,272) size 45x11
@@ -34,5 +33,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,274) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,271) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -24,9 +24,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,264) size 45x11
@@ -39,6 +38,8 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,266) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,263) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
layer at (8,282) size 320x240
@@ -50,9 +51,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,504) size 45x11
@@ -65,6 +65,8 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,506) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,503) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
layer at (8,522) size 320x240
@@ -78,9 +80,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,744) size 45x11
@@ -93,5 +94,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,746) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,743) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -18,9 +18,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,248) size 45x11
@@ -33,5 +32,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,250) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,247) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -19,9 +19,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 273x15
RenderSlider {INPUT} at (45,2) size 183x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 183x13
- RenderBlock {DIV} at (0,0) size 173x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (173,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 173x8
+ RenderBlock {DIV} at (173,2) size 10x8
RenderButton {INPUT} at (329,4) size 16x16
RenderBlock {DIV} at (322,12) size 0x0
layer at (57,312) size 45x11
@@ -34,3 +33,5 @@
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 (102,314) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
Modified: trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt (120738 => 120739)
--- trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt 2012-06-19 18:21:16 UTC (rev 120738)
+++ trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt 2012-06-19 18:25:01 UTC (rev 120739)
@@ -20,9 +20,8 @@
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
- RenderBlock {DIV} at (0,0) size 116x13
- RenderBlock {DIV} at (0,0) size 10x8
- RenderBlock {DIV} at (116,0) size 10x8
+ RenderBlock {DIV} at (0,2) size 116x8
+ RenderBlock {DIV} at (116,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderBlock {DIV} at (265,6) size 25x12
layer at (57,290) size 45x11
@@ -35,5 +34,7 @@
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
+layer at (102,292) size 10x8
+ RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (275,289) size 14x12
RenderButton zI: 1 {INPUT} at (2,0) size 14x12
