Unreviewed gardening; rebaseline two media/ tests.

* platform/mac-mavericks/media/controls-after-reload-expected.txt: Added.
* platform/mac-mavericks/media/controls-styling-expected.txt:
* platform/mac-mountainlion/media/controls-after-reload-expected.txt: Added.
* platform/mac-mountainlion/media/controls-styling-expected.txt: Copied from LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt.
* platform/mac-wk1/media/controls-styling-expected.txt: Copied from LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7d05d2161f93fcbf39e7ff044e928a2365629c49..49b6e49f60953a2962ff736e2e2bd6f25cbdd45c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2014-10-30  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed gardening; rebaseline two media/ tests.
+
+        * platform/mac-mavericks/media/controls-after-reload-expected.txt: Added.
+        * platform/mac-mavericks/media/controls-styling-expected.txt:
+        * platform/mac-mountainlion/media/controls-after-reload-expected.txt: Added.
+        * platform/mac-mountainlion/media/controls-styling-expected.txt: Copied from LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt.
+        * platform/mac-wk1/media/controls-styling-expected.txt: Copied from LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt.
+
 2014-10-29  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         ASSERTION NOT REACHED because RenderStyle::setWordSpacing() does not handle a Length value of type 'Calculated'.

diff --git a/LayoutTests/platform/mac-mavericks/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac-mavericks/media/controls-after-reload-expected.txt
new file mode 100644 (file)
index 0000000..c3fcef8
--- /dev/null
+++ b/LayoutTests/platform/mac-mavericks/media/controls-after-reload-expected.txt
@@ -0,0 +1,52 @@
+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 360x18
+          text run at (0,0) width 360: "Making sure the controller looks ok after a second load()."
+      RenderBlock (anonymous) at (0,34) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (14,262) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (40,262) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,265) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (57,265) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x11
+      RenderText {#text} at (0,0) size 26x11
+        text run at (0,0) width 26: "00:00"
+layer at (229,265) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) 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 (104,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (274,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (277,262) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (305,262) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]

diff --git a/LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt b/LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt
index 9b114e373f73ed6d66e82f0d9597ff0b15215d6b..2c238d37ee6b0005f2a66ea934d901336fbb239a 100644 (file)
--- a/LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/mac-mavericks/media/controls-styling-expected.txt
@@ -17,9 +17,7 @@ layer at (8,282) size 320x240
 layer at (18,42) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (18,257) size 320x25
-  RenderBlock {DIV} at (0,215) size 320x25
-layer at (18,257) size 320x25
-  RenderFlexibleBox {DIV} at (0,0) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
 layer at (24,262) size 16x16
   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
 layer at (50,262) size 16x16
@@ -59,9 +57,7 @@ layer at (315,262) size 16x16
 layer at (8,282) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
 layer at (8,497) size 320x25
-  RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,497) size 320x25
-  RenderFlexibleBox {DIV} at (0,0) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
 layer at (14,502) size 16x16
   RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
 layer at (40,502) size 16x16

diff --git a/LayoutTests/platform/mac-mountainlion/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac-mountainlion/media/controls-after-reload-expected.txt
new file mode 100644 (file)
index 0000000..c3fcef8
--- /dev/null
+++ b/LayoutTests/platform/mac-mountainlion/media/controls-after-reload-expected.txt
@@ -0,0 +1,52 @@
+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 360x18
+          text run at (0,0) width 360: "Making sure the controller looks ok after a second load()."
+      RenderBlock (anonymous) at (0,34) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (14,262) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (40,262) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,265) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (57,265) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x11
+      RenderText {#text} at (0,0) size 26x11
+        text run at (0,0) width 26: "00:00"
+layer at (229,265) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) 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 (104,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (274,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (277,262) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (305,262) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]

diff --git a/LayoutTests/platform/mac-mountainlion/media/controls-styling-expected.txt b/LayoutTests/platform/mac-mountainlion/media/controls-styling-expected.txt
new file mode 100644 (file)
index 0000000..2c238d3
--- /dev/null
+++ b/LayoutTests/platform/mac-mountainlion/media/controls-styling-expected.txt
@@ -0,0 +1,96 @@
+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 274x18
+          text run at (0,0) width 274: "The look of the controls should not change."
+      RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,274) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (18,42) size 320x240
+  RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (18,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (18,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (24,262) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (50,262) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (67,265) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (67,265) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x11
+      RenderText {#text} at (0,0) size 26x11
+        text run at (0,0) width 26: "00:00"
+layer at (239,265) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) 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 (114,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (114,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (284,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (284,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (270,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (287,262) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (315,262) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,282) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,497) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (14,502) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (40,502) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,505) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (57,505) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (9,0) size 27x11
+      RenderText {#text} at (0,0) size 26x11
+        text run at (0,0) width 26: "00:00"
+layer at (229,505) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) 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 (104,506) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,507) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,499) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (274,499) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,506) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (277,502) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (305,502) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]

diff --git a/LayoutTests/platform/mac-wk1/media/controls-styling-expected.txt b/LayoutTests/platform/mac-wk1/media/controls-styling-expected.txt
new file mode 100644 (file)
index 0000000..4aa45d8
--- /dev/null
+++ b/LayoutTests/platform/mac-wk1/media/controls-styling-expected.txt
@@ -0,0 +1,96 @@
+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 274x18
+          text run at (0,0) width 274: "The look of the controls should not change."
+      RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,274) size 784x240
+        RenderText {#text} at (0,0) size 0x0
+layer at (18,42) size 320x240
+  RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (8,282) size 320x240
+  RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (18,42) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (18,257) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (24,262) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (50,262) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (67,265) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (67,265) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (10,0) size 25x11
+      RenderText {#text} at (0,0) size 25x11
+        text run at (0,0) width 25: "00:00"
+layer at (239,265) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (8,0) size 29x11
+      RenderText {#text} at (0,0) size 29x11
+        text run at (0,0) width 29: "-00:06"
+layer at (114,266) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (114,267) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (284,259) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (284,259) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (270,266) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (287,262) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (315,262) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,282) size 320x240
+  RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,497) size 320x25
+  RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (14,502) size 16x16
+  RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (40,502) size 16x16
+  RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,505) size 217x11
+  RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (57,505) size 45x11
+  RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (10,0) size 25x11
+      RenderText {#text} at (0,0) size 25x11
+        text run at (0,0) width 25: "00:00"
+layer at (229,505) size 45x11
+  RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
+    RenderBlock (anonymous) at (8,0) size 29x11
+      RenderText {#text} at (0,0) size 29x11
+        text run at (0,0) width 29: "-00:06"
+layer at (104,506) size 123x9
+  RenderFlexibleBox {DIV} at (47,1) size 123x9
+    RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+      RenderFlexibleBox {DIV} at (0,0) size 123x9
+        RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,507) size 6x6
+  RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,499) size 22x22
+  RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (274,499) size 2x22
+  RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+    RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+      RenderFlexibleBox {DIV} at (1,1) size 0x8
+        RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,506) size 8x8
+  RenderBlock {DIV} at (-8,0) size 8x8
+layer at (277,502) size 16x16
+  RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (305,502) size 16x16
+  RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]