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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@110607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 318276e..ffcb72e 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-13  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <timothy_horton@apple.com>
 
         Unreviewed rebaseline of fast/css/getComputedStyle/computed-style(without-renderer).html for mac, adding -webkit-grid-*

diff --git a/LayoutTests/media/sources-fallback-codecs-expected.txt b/LayoutTests/media/sources-fallback-codecs-expected.txt
index 0cf988d..7216bec 100644 (file)
--- a/LayoutTests/media/sources-fallback-codecs-expected.txt
+++ b/LayoutTests/media/sources-fallback-codecs-expected.txt
@@ -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
 

diff --git a/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt b/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt
deleted file mode 100644 (file)
index 7216bec..0000000
--- a/LayoutTests/platform/chromium-mac/media/sources-fallback-codecs-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that fallback among codecs is done correctly regardless of their order.     
-END OF TEST
-

diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
index 0aaf226..507984e 100644 (file)
--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -15,66 +15,70 @@ layer at (0,0) size 800x600
         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

diff --git a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
index 9071896..eb2d4f3 100644 (file)
--- a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
@@ -11,27 +11,25 @@ layer at (0,0) size 800x600
 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

diff --git a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
index 482312d..a4b7a13 100644 (file)
--- a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
+++ b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
@@ -12,26 +12,26 @@ layer at (8,8) size 300x150
 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

diff --git a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
index 2528dc3..3e9d461 100644 (file)
--- a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
+++ b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
@@ -12,27 +12,25 @@ layer at (0,0) size 800x320
 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