Reviewed by Oliver.

        Fix for <rdar://5683527> media/{audio,video|-controls-rendering.html failing

        Remove platform specific results from media directory, since they should match the mac.  Also, remove these tests from the skipped list.

        * platform/win/Skipped:
        * platform/win/media: Removed.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4fc16f8..5a45751 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2008-01-18  Adele Peterson  <adele@apple.com>
 
+        Reviewed by Oliver.
+
+        Fix for <rdar://5683527> media/{audio,video|-controls-rendering.html failing
+        
+        Remove platform specific results from media directory, since they should match the mac.  Also, remove these tests from the skipped list.
+        
+        * platform/win/Skipped:
+        * platform/win/media: Removed.
+
+2008-01-18  Adele Peterson  <adele@apple.com>
+
         Updating these results again.  I accidently checked in the other results with some local changes.
 
         * platform/mac/media/audio-controls-rendering-expected.checksum:

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 11a21dd..f661250 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -344,10 +344,6 @@ fast/xsl/sort-unicode.xml
 # <rdar://5683523> Failing on at least one bot
 fast/dom/Window/window-screen-properties.html
 
-# <rdar://5683527>
-media/audio-controls-rendering.html
-media/video-controls-rendering.html
-
 # <rdar://5686091> This test crashes, and sometimes freezes buildbot.
 fast/frames/frame-name-reset.html
 

diff --git a/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt
deleted file mode 100644 (file)
index 813f950..0000000
--- a/LayoutTests/platform/win/media/audio-controls-rendering-expected.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 153x18
-          text run at (0,0) width 153: "Test controls placement."
-      RenderBlock (anonymous) at (0,34) size 784x68
-        RenderMedia {AUDIO} at (0,0) size 200x16 [bgcolor=#0000FF]
-        RenderBR {BR} at (200,16) size 0x0
-        RenderBR {BR} at (0,16) size 0x18
-        RenderMedia {AUDIO} at (0,34) size 320x16 [bgcolor=#0000FF]
-        RenderBR {BR} at (320,50) size 0x0
-        RenderBR {BR} at (0,50) size 0x18
-      RenderBlock (anonymous) at (0,102) size 784x18
-        RenderBR {BR} at (0,0) size 0x18
-layer at (8,42) size 200x16
-  RenderBlock (relative positioned) {DIV} at (0,0) size 200x16
-layer at (8,42) size 200x18
-  RenderBlock (positioned) {DIV} at (0,0) size 200x16
-    RenderButton {INPUT} at (0,0) size 200x18
-layer at (8,42) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,42) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,42) size 126x16
-  RenderSlider {INPUT} at (37,0) size 126x16
-layer at (45,43) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (175,42) size 17x16
-  RenderButton {INPUT} at (167,0) size 17x16
-layer at (191,42) size 17x16
-  RenderButton {INPUT} at (183,0) size 17x16
-layer at (8,76) size 320x16
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x16
-layer at (8,76) size 320x18
-  RenderBlock (positioned) {DIV} at (0,0) size 320x16
-    RenderButton {INPUT} at (0,0) size 320x18
-layer at (8,76) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,76) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,76) size 246x16
-  RenderSlider {INPUT} at (37,0) size 246x16
-layer at (45,77) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (295,76) size 17x16
-  RenderButton {INPUT} at (287,0) size 17x16
-layer at (311,76) size 17x16
-  RenderButton {INPUT} at (303,0) size 17x16
-layer at (8,110) size 320x100
-  RenderMedia {AUDIO} at (8,110) size 320x100 [bgcolor=#0000FF]
-layer at (8,110) size 320x100
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
-layer at (8,194) size 320x18
-  RenderBlock (positioned) {DIV} at (0,84) size 320x16
-    RenderButton {INPUT} at (0,0) size 320x18
-layer at (8,194) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,194) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,194) size 246x16
-  RenderSlider {INPUT} at (37,0) size 246x16
-layer at (45,195) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (295,194) size 17x16
-  RenderButton {INPUT} at (287,0) size 17x16
-layer at (311,194) size 17x16
-  RenderButton {INPUT} at (303,0) size 17x16

diff --git a/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt b/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt
deleted file mode 100644 (file)
index bec3afd..0000000
--- a/LayoutTests/platform/win/media/video-aspect-ratio-expected.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 623x18
-          text run at (0,0) width 623: "Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size."
-      RenderBlock (anonymous) at (0,34) size 784x480
-        RenderVideo {VIDEO} at (0,0) size 320x240
-        RenderBR {BR} at (320,240) size 0x0
-        RenderVideo {VIDEO} at (0,240) size 160x120
-        RenderBlock {DIV} at (160,240) size 320x120
-          RenderVideo {VIDEO} at (0,0) size 160x120
-          RenderVideo {VIDEO} at (160,0) size 160x120
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {DIV} at (0,360) size 320x120
-          RenderVideo {VIDEO} at (0,0) size 160x120
-          RenderVideo {VIDEO} at (160,0) size 160x120
-          RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-layer at (328,402) size 320x120
-  RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
-layer at (328,402) size 160x120
-  RenderVideo {VIDEO} at (0,0) size 160x120
-layer at (488,402) size 160x120
-  RenderVideo {VIDEO} at (160,0) size 160x120

diff --git a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
deleted file mode 100644 (file)
index eae2ec0..0000000
--- a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-layer at (0,0) size 785x762
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x600
-  RenderBlock {HTML} at (0,0) size 785x600
-    RenderBody {BODY} at (8,8) size 769x584
-      RenderBlock {P} at (0,0) size 769x18
-        RenderText {#text} at (0,0) size 153x18
-          text run at (0,0) width 153: "Test controls placement."
-      RenderBlock (anonymous) at (0,34) size 769x480
-        RenderVideo {VIDEO} at (0,0) size 320x240
-        RenderBR {BR} at (320,240) size 0x0
-        RenderVideo {VIDEO} at (0,240) size 320x240
-        RenderBR {BR} at (320,480) size 0x0
-      RenderBlock (anonymous) at (0,514) size 769x18
-        RenderBR {BR} at (0,0) size 0x18
-layer at (8,42) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,266) size 320x18
-  RenderBlock (positioned) {DIV} at (0,224) size 320x16
-    RenderButton {INPUT} at (0,0) size 320x18
-layer at (8,266) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,266) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,266) size 246x16
-  RenderSlider {INPUT} at (37,0) size 246x16
-layer at (45,267) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (295,266) size 17x16
-  RenderButton {INPUT} at (287,0) size 17x16
-layer at (311,266) size 17x16
-  RenderButton {INPUT} at (303,0) size 17x16
-layer at (8,282) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,506) size 320x18
-  RenderBlock (positioned) {DIV} at (0,224) size 320x16
-    RenderButton {INPUT} at (0,0) size 320x18
-layer at (8,506) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,506) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,506) size 246x16
-  RenderSlider {INPUT} at (37,0) size 246x16
-layer at (45,507) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (295,506) size 17x16
-  RenderButton {INPUT} at (287,0) size 17x16
-layer at (311,506) size 17x16
-  RenderButton {INPUT} at (303,0) size 17x16
-layer at (8,522) size 320x240
-  RenderVideo {VIDEO} at (8,522) size 320x240
-layer at (8,522) size 320x240
-  RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,746) size 320x18 backgroundClip at (0,0) size 785x762 clip at (0,0) size 785x762 outlineClip at (0,0) size 785x762
-  RenderBlock (positioned) {DIV} at (0,224) size 320x16
-    RenderButton {INPUT} at (0,0) size 320x18
-layer at (8,746) size 17x16
-  RenderButton {INPUT} at (0,0) size 17x16
-layer at (24,746) size 17x16
-  RenderButton {INPUT} at (16,0) size 17x16
-layer at (45,746) size 246x16
-  RenderSlider {INPUT} at (37,0) size 246x16
-layer at (45,747) size 15x15
-  RenderBlock (relative positioned) {DIV} at (0,0) size 15x15
-layer at (295,746) size 17x16
-  RenderButton {INPUT} at (287,0) size 17x16
-layer at (311,746) size 17x16
-  RenderButton {INPUT} at (303,0) size 17x16

diff --git a/LayoutTests/platform/win/media/video-transformed-expected.txt b/LayoutTests/platform/win/media/video-transformed-expected.txt
deleted file mode 100644 (file)
index c7915d5..0000000
--- a/LayoutTests/platform/win/media/video-transformed-expected.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 217x18
-          text run at (0,0) width 217: "Test painting of transformed video"
-      RenderBlock (anonymous) at (0,34) size 784x480
-        RenderText {#text} at (0,142) size 4x18
-          text run at (0,142) width 4: " "
-        RenderBR {BR} at (210,156) size 0x0
-        RenderText {#text} at (0,302) size 4x18
-          text run at (0,302) width 4: " "
-        RenderBR {BR} at (210,316) size 0x0
-        RenderText {#text} at (0,462) size 4x18
-          text run at (0,462) width 4: " "
-        RenderBR {BR} at (210,476) size 0x0
-layer at (12,42) size 206x156
-  RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
-layer at (12,202) size 206x156
-  RenderVideo {VIDEO} at (4,160) size 206x156 [border: (3px solid #FF0000)]
-layer at (12,362) size 206x156
-  RenderVideo {VIDEO} at (4,320) size 206x156 [border: (3px solid #FF0000)]