Diff
Modified: trunk/LayoutTests/ChangeLog (110606 => 110607)
--- trunk/LayoutTests/ChangeLog 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/ChangeLog 2012-03-13 21:15:00 UTC (rev 110607)
@@ -1,3 +1,17 @@
+2012-03-13 Alexey Proskuryakov <[email protected]>
+
+ Updating some Mac results in media directory.
+
+ * platform/chromium-mac/media/sources-fallback-codecs-expected.txt: Removed.
+ * media/sources-fallback-codecs-expected.txt:
+ Chromium result just matched what actually happened on Mac, so merging it into cross-platform.
+
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/media-controls-clone-expected.txt:
+ * platform/mac/media/video-playing-and-pause-expected.txt:
+ Updated for render tree changes. I'm getting the same results locally as buildbot does.
+
2012-03-13 Tim Horton <[email protected]>
Unreviewed rebaseline of fast/css/getComputedStyle/computed-style(without-renderer).html for mac, adding -webkit-grid-*
Modified: trunk/LayoutTests/media/sources-fallback-codecs-expected.txt (110606 => 110607)
--- trunk/LayoutTests/media/sources-fallback-codecs-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/media/sources-fallback-codecs-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -1,3 +1,3 @@
-Test that fallback among codecs is done correctly regardless of their order.
+Test that fallback among codecs is done correctly regardless of their order.
END OF TEST
Deleted: trunk/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt (110606 => 110607)
--- trunk/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -1,3 +0,0 @@
-Test that fallback among codecs is done correctly regardless of their order.
-END OF TEST
-
Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (110606 => 110607)
--- trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -15,66 +15,70 @@
RenderBR {BR} at (0,68) size 0x18
RenderBR {BR} at (0,86) size 0x18
layer at (8,42) size 200x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
layer at (8,42) size 200x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 126x15
+ RenderDeprecatedFlexibleBox {DIV} at (0,2) size 0x11 [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"
RenderSlider {INPUT} at (0,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
RenderBlock {DIV} at (0,2) size 116x8
RenderBlock {DIV} at (116,2) size 10x8
+ RenderDeprecatedFlexibleBox {DIV} at (126,2) size 0x11 [color=#FFFFFF]
+ RenderBlock (anonymous) at (7,0) size 31x11
+ RenderText {#text} at (0,0) size 31x11
+ text run at (0,0) width 31: "-00:07"
RenderButton {INPUT} at (177,6) size 14x12
layer at (57,51) size 10x8
RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (8,85) size 320x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x25
layer at (8,85) size 320x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 320x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
+ RenderDeprecatedFlexibleBox {DIV} at (0,2) 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"
RenderSlider {INPUT} at (45,2) size 156x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 156x13
RenderBlock {DIV} at (0,2) size 146x8
RenderBlock {DIV} at (146,2) size 10x8
+ RenderDeprecatedFlexibleBox {DIV} at (201,2) 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:07"
RenderButton {INPUT} at (297,6) size 14x12
-layer at (57,92) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (0,2) 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 (258,92) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (201,2) 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:07"
layer at (102,94) size 10x8
RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
layer at (8,128) size 320x100
RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
layer at (8,128) size 320x100
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x100
layer at (8,203) size 320x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,75) size 320x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,75) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 246x15
+ RenderDeprecatedFlexibleBox {DIV} at (0,2) 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"
RenderSlider {INPUT} at (45,2) size 156x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 156x13
RenderBlock {DIV} at (0,2) size 146x8
RenderBlock {DIV} at (146,2) size 10x8
+ RenderDeprecatedFlexibleBox {DIV} at (201,2) 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:07"
RenderButton {INPUT} at (297,6) size 14x12
-layer at (57,210) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (0,2) 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 (258,210) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (201,2) 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:07"
layer at (102,212) size 10x8
RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (110606 => 110607)
--- trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -11,27 +11,25 @@
layer at (8,42) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,42) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,257) size 320x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+ RenderDeprecatedFlexibleBox {DIV} at (0,2) 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"
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
RenderBlock {DIV} at (0,2) size 116x8
RenderBlock {DIV} at (116,2) size 10x8
+ RenderDeprecatedFlexibleBox {DIV} at (171,2) 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:06"
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
-layer at (57,264) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (0,2) 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 (228,264) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (171,2) 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:06"
layer at (102,266) size 10x8
RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (110606 => 110607)
--- trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -12,26 +12,26 @@
layer at (8,162) size 300x150
RenderVideo {VIDEO} at (0,0) size 300x150
layer at (8,8) size 300x150
- RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
layer at (8,133) size 300x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,125) size 300x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
layer at (308,133) size 200x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
layer at (308,133) size 200x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
layer at (8,162) size 300x150
- RenderBlock (relative positioned) {DIV} at (0,0) size 300x150
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
layer at (8,287) size 300x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,125) size 300x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
layer at (308,287) size 200x25
- RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
layer at (308,287) size 200x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 200x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
Modified: trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt (110606 => 110607)
--- trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt 2012-03-13 21:12:30 UTC (rev 110606)
+++ trunk/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt 2012-03-13 21:15:00 UTC (rev 110607)
@@ -12,27 +12,25 @@
layer at (8,68) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,68) size 320x240
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,283) size 320x25
- RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,215) size 320x25
+ RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderDeprecatedFlexibleBox {DIV} at (49,5) size 216x15
+ RenderDeprecatedFlexibleBox {DIV} at (0,2) 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"
RenderSlider {INPUT} at (45,2) size 126x13
RenderDeprecatedFlexibleBox {DIV} at (0,0) size 126x13
RenderBlock {DIV} at (0,2) size 116x8
RenderBlock {DIV} at (116,2) size 10x8
+ RenderDeprecatedFlexibleBox {DIV} at (171,2) 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:06"
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
-layer at (57,290) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (0,2) 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 (228,290) size 45x11
- RenderDeprecatedFlexibleBox {DIV} at (171,2) 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:06"
layer at (102,292) size 10x8
RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
