Adding missing results.

        * platform/mac/media/audio-repaint-expected.txt: Added.
        * platform/mac/media/controls-strict-expected.txt: Added.
        * platform/mac/media/video-controls-rendering-expected.txt: Added.
        * platform/mac/media/video-no-audio-expected.txt: Added.
        * platform/mac/media/video-display-toggle-expected.txt: Added.
        These already had PNG results, but no text results for platform/mac.

        * platform/mac/media/controls-layout-direction-expected.png: Added.
        * platform/mac/media/video-playing-and-pause-expected.png: Added.
        These had text results, but no pixel ones.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8e75221..ccff821 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2012-03-13  Alexey Proskuryakov  <ap@apple.com>
+
+        Adding missing results.
+
+        * platform/mac/media/audio-repaint-expected.txt: Added.
+        * platform/mac/media/controls-strict-expected.txt: Added.
+        * platform/mac/media/video-controls-rendering-expected.txt: Added.
+        * platform/mac/media/video-no-audio-expected.txt: Added.
+        * platform/mac/media/video-display-toggle-expected.txt: Added.
+        These already had PNG results, but no text results for platform/mac.
+
+        * platform/mac/media/controls-layout-direction-expected.png: Added.
+        * platform/mac/media/video-playing-and-pause-expected.png: Added.
+        These had text results, but no pixel ones.
+
 2012-03-13  Dave Tharp  <dtharp@codeaurora.org>
 
         Alternate stylesheets (without title attribute) are loaded on refresh

diff --git a/LayoutTests/platform/mac/media/audio-repaint-expected.txt b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
new file mode 100644 (file)
index 0000000..67600a3
--- /dev/null
+++ b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
@@ -0,0 +1,84 @@
+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 699x18
+          text run at (0,0) width 609: "This tests that in a html document with inline audio content, the media element repaints correctly "
+          text run at (609,0) width 90: "while playing."
+      RenderBlock (anonymous) at (0,34) size 784x154
+        RenderMedia {AUDIO} at (0,0) size 200x25
+        RenderBR {BR} at (200,25) size 0x0
+        RenderBR {BR} at (200,75) size 0x0
+        RenderBR {BR} at (200,154) size 0x0
+layer at (8,67) size 200x25
+  RenderMedia {AUDIO} at (0,25) size 200x25
+layer at (8,67) size 200x25
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+layer at (8,67) 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:00"
+    RenderButton {INPUT} at (177,6) size 14x12
+layer at (114,76) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
+layer at (8,42) size 200x25
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+layer at (8,42) 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:00"
+    RenderButton {INPUT} at (177,6) size 14x12
+layer at (114,51) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
+layer at (8,144) size 200x25
+  RenderMedia {AUDIO} at (0,102) size 200x25
+layer at (8,144) size 200x25
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
+layer at (8,144) 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:00"
+    RenderButton {INPUT} at (177,6) size 14x12
+layer at (114,153) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8

diff --git a/LayoutTests/platform/mac/media/controls-layout-direction-expected.png b/LayoutTests/platform/mac/media/controls-layout-direction-expected.png
new file mode 100644 (file)
index 0000000..4669740
Binary files /dev/null and b/LayoutTests/platform/mac/media/controls-layout-direction-expected.png differ

diff --git a/LayoutTests/platform/mac/media/controls-strict-expected.txt b/LayoutTests/platform/mac/media/controls-strict-expected.txt
new file mode 100644 (file)
index 0000000..84de008
--- /dev/null
+++ b/LayoutTests/platform/mac/media/controls-strict-expected.txt
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x302
+  RenderBlock {HTML} at (0,0) size 800x302
+    RenderBody {BODY} at (8,16) size 784x278
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 226x18
+          text run at (0,0) width 226: "Drawing the controls in strict mode."
+      RenderBlock (anonymous) at (0,34) size 784x244
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,50) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,50) size 320x240
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,265) 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 (102,274) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8

diff --git a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
new file mode 100644 (file)
index 0000000..49006fb
--- /dev/null
+++ b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
@@ -0,0 +1,88 @@
+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 {DIV} at (0,34) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,274) size 769x240
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,514) size 769x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,257) 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 (102,266) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
+layer at (8,282) size 320x240
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,497) 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 (102,506) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
+layer at (8,522) size 320x240
+  RenderVideo {VIDEO} at (8,522) size 320x240
+layer at (8,522) size 320x240
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,737) 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 (102,746) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8

diff --git a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
new file mode 100644 (file)
index 0000000..553b60c
--- /dev/null
+++ b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
@@ -0,0 +1,34 @@
+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
+      RenderText {#text} at (0,0) size 493x18
+        text run at (0,0) width 493: "This tests that toggling the display property won't make the controls disappear."
+      RenderBR {BR} at (493,14) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (8,26) size 320x240
+  RenderVideo {VIDEO} at (0,18) size 320x240
+layer at (8,26) size 320x240
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,241) 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 (102,250) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8

diff --git a/LayoutTests/platform/mac/media/video-no-audio-expected.txt b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
new file mode 100644 (file)
index 0000000..1700e17
--- /dev/null
+++ b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
@@ -0,0 +1,34 @@
+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 413x18
+          text run at (0,0) width 413: "Movie with no audio track. The volume button should not render."
+      RenderBlock (anonymous) at (0,34) size 784x288
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 352x288
+  RenderVideo {VIDEO} at (0,0) size 352x288
+layer at (8,42) size 352x288
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 352x288
+layer at (8,305) size 352x25
+  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,263) size 352x25
+    RenderButton {INPUT} at (6,3) size 18x18
+    RenderButton {INPUT} at (32,4) size 16x16
+    RenderDeprecatedFlexibleBox {DIV} at (49,5) size 273x15
+      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 183x13
+        RenderDeprecatedFlexibleBox {DIV} at (0,0) size 183x13
+          RenderBlock {DIV} at (0,2) size 173x8
+          RenderBlock {DIV} at (173,2) size 10x8
+      RenderDeprecatedFlexibleBox {DIV} at (228,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:09"
+    RenderButton {INPUT} at (329,4) size 16x16
+layer at (102,314) size 10x8
+  RenderBlock (relative positioned) {DIV} at (0,0) size 10x8

diff --git a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.png b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.png
new file mode 100644 (file)
index 0000000..38d8fe5
Binary files /dev/null and b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.png differ