Fixed media test failures caused by http://trac.webkit.org/changeset/52998.

        The media controller on Windows now has a full-screen button, which changes
        the layout and therefore the test results. I regenerated them for
        Windows.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2fe6b2cbd40087ccf0faaa3f4fc578ea53a85ccc..b801221f06caffa6d0b4a4bef1658674f74fd8f6 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-08  Chris Marrin  <cmarrin@apple.com>
+
+        Fixed media test failures caused by http://trac.webkit.org/changeset/52998.
+        The media controller on Windows now has a full-screen button, which changes
+        the layout and therefore the test results. I regenerated them for
+        Windows.
+
+        * platform/win/media/controls-after-reload-expected.txt:
+        * platform/win/media/controls-drag-timebar-expected.txt:
+        * platform/win/media/controls-strict-expected.txt:
+        * platform/win/media/controls-styling-expected.txt:
+        * platform/win/media/video-controls-rendering-expected.txt:
+        * platform/win/media/video-display-toggle-expected.txt:
+        * platform/win/media/video-no-audio-expected.txt:
+
 2010-01-08  Brian Weinstein  <bweinstein@apple.com>
 
         Rubber-stamped by Adam Roben.

diff --git a/LayoutTests/platform/win/media/controls-after-reload-expected.txt b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index 923fac32fcfca52a789b8f59d25ead38a018472c..a433cf63a01ffeaf92d009096d6e7c57a7593c54 100644 (file)
--- a/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
@@ -17,9 +17,10 @@ layer at (8,42) size 320x240
 layer at (8,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16

diff --git a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
index 323108508fe1416a7464f0f1f4dd3c2b3b72bf94..b7dbe1d4751b66bea71d69f71f11c1143c4017cf 100644 (file)
--- a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
+++ b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
@@ -4,10 +4,10 @@ RUN(video.autoplay = true)
 RUN(video.src = 'content/test.mp4')
 EVENT(playing)
 EVENT(seeked)
-Time: 2.1
+Time: 2.3
 EVENT(seeked)
-Time: 2.6
+Time: 2.8
 EVENT(seeked)
-Time: 3.1
+Time: 3.4
 END OF TEST
 

diff --git a/LayoutTests/platform/win/media/controls-strict-expected.txt b/LayoutTests/platform/win/media/controls-strict-expected.txt
index 5296d5593e54bb5c333c2ffdf41b5c5f2a9ee1bc..45db871420d6506f0dcbc727cc7abc4ef9f55c6e 100644 (file)
--- a/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/win/media/controls-strict-expected.txt
@@ -17,9 +17,10 @@ layer at (8,50) size 320x240
 layer at (8,274) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16

diff --git a/LayoutTests/platform/win/media/controls-styling-expected.txt b/LayoutTests/platform/win/media/controls-styling-expected.txt
index fd24373b502566d41fe5995583a8a2af8f12f346..507123f4ef4215fd5087bec23be03b07450e49b8 100644 (file)
--- a/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -21,9 +21,10 @@ layer at (18,42) size 320x240
 layer at (18,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -32,9 +33,10 @@ layer at (8,282) size 320x240
 layer at (8,506) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16

diff --git a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
index fff11e122c248c748c42b7c6a9f4e09e9507b92c..791807ed69de920033fe6f6027a68dacf6404419 100644 (file)
--- a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
@@ -20,9 +20,10 @@ layer at (8,42) size 320x240
 layer at (8,266) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -31,9 +32,10 @@ layer at (8,282) size 320x240
 layer at (8,506) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16
@@ -44,9 +46,10 @@ layer at (8,522) size 320x240
 layer at (8,746) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16

diff --git a/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index a9baa000fa65b1b18018f6556dada257995fc4a1..a4f8539d16d3c74ac6a98b1cc00b7ae93bb70bed 100644 (file)
--- a/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
@@ -16,9 +16,10 @@ layer at (8,26) size 320x240
 layer at (8,250) size 320x16
   RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 256x16
-      RenderSlider {INPUT} at (0,0) size 256x16
+    RenderFlexibleBox {DIV} at (16,0) size 240x16
+      RenderSlider {INPUT} at (0,0) size 240x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (256,0) size 16x16
     RenderButton {INPUT} at (272,0) size 16x16
     RenderButton {INPUT} at (288,0) size 16x16
     RenderButton {INPUT} at (304,0) size 16x16

diff --git a/LayoutTests/platform/win/media/video-no-audio-expected.txt b/LayoutTests/platform/win/media/video-no-audio-expected.txt
index f0872fc127e895a63ffa4b36a05c274bbdb40827..54006bfacb3a2a92e7878a8b66a4504939256ae7 100644 (file)
--- a/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/win/media/video-no-audio-expected.txt
@@ -17,8 +17,9 @@ layer at (8,42) size 640x480
 layer at (8,506) size 640x16
   RenderFlexibleBox (positioned) {DIV} at (0,464) size 640x16
     RenderButton {INPUT} at (0,0) size 16x16
-    RenderFlexibleBox {DIV} at (16,0) size 592x16
-      RenderSlider {INPUT} at (0,0) size 592x16
+    RenderFlexibleBox {DIV} at (16,0) size 576x16
+      RenderSlider {INPUT} at (0,0) size 576x16
         RenderBlock {DIV} at (2,1) size 13x14
+    RenderButton {INPUT} at (592,0) size 16x16
     RenderButton {INPUT} at (608,0) size 16x16
     RenderButton {INPUT} at (624,0) size 16x16