Rebaseline some tests that changed upstream.

http://trac.webkit.org/changeset/40154

Review URL: http://codereview.chromium.org/18825

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8673 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 109 insertions, 115 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
index 42ba5b1..5fb2e75 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
@@ -1,12 +1,12 @@
-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 685x19
-        text run at (0,0) width 685: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
-      RenderBR {BR} at (685,15) size 0x0
-      RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 23x18
-          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-      RenderText {#text} at (0,0) size 0x0
+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 685x19

+        text run at (0,0) width 685: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."

+      RenderBR {BR} at (685,15) size 0x0

+      RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+        RenderBlock (anonymous) at (1,1) size 23x18

+          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+      RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
index 8678eff..8224003 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
@@ -1,12 +1,12 @@
-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 776x19
-        text run at (0,0) width 776: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select box."
-      RenderBR {BR} at (776,15) size 0x0
-      RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 23x18
-          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-      RenderText {#text} at (0,0) size 0x0
+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 776x19

+        text run at (0,0) width 776: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select box."

+      RenderBR {BR} at (776,15) size 0x0

+      RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+        RenderBlock (anonymous) at (1,1) size 23x18

+          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+      RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-separator-painting-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-separator-painting-expected.txt
index 6250ad8..67666ba 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-separator-painting-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/menulist-separator-painting-expected.txt
@@ -1,11 +1,11 @@
-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 {DIV} at (0,0) size 784x6 [border: (3px solid #FFFFFF)]
-      RenderBlock (anonymous) at (0,6) size 784x20
-        RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #008000)]
-          RenderBlock (anonymous) at (1,1) size 23x18
-            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #008000)]
-        RenderText {#text} at (0,0) size 0x0
+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 {DIV} at (0,0) size 784x6 [border: (3px solid #FFFFFF)]

+      RenderBlock (anonymous) at (0,6) size 784x20

+        RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #008000)]

+          RenderBlock (anonymous) at (1,1) size 23x18

+            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.txt
index 13bbfaf..6ac7436 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.txt
@@ -1,47 +1,47 @@
-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 444x19
-        text run at (0,0) width 444: "This tests that empty select controls and buttons have the correct baseline."
-      RenderBR {BR} at (444,15) size 0x0
-      RenderMenuList {SELECT} at (0,21) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 23x18
-          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-      RenderText {#text} at (25,21) size 29x19
-        text run at (25,21) width 29: " test "
-      RenderMenuList {SELECT} at (54,21) size 47x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 45x18
-          RenderText at (4,1) size 22x16
-            text run at (4,1) width 22: "test"
-      RenderText {#text} at (101,21) size 4x19
-        text run at (101,21) width 4: " "
-      RenderMenuList {SELECT} at (105,21) size 25x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (1px solid #00008B)]
-        RenderBlock (anonymous) at (1,1) size 23x18
-          RenderBR at (4,1) size 0x16 [bgcolor=#ADD8E6] [border: (1px solid #00008B)]
-      RenderText {#text} at (130,21) size 29x19
-        text run at (130,21) width 29: " test "
-      RenderMenuList {SELECT} at (159,21) size 47x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (1px solid #00008B)]
-        RenderBlock (anonymous) at (1,1) size 45x18
-          RenderText at (4,1) size 22x16
-            text run at (4,1) width 22: "test"
-      RenderText {#text} at (206,21) size 4x19
-        text run at (206,21) width 4: " "
-      RenderButton {BUTTON} at (210,21) size 16x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-      RenderText {#text} at (226,21) size 4x19
-        text run at (226,21) width 4: " "
-      RenderButton {BUTTON} at (230,20) size 44x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-        RenderBlock (anonymous) at (8,2) size 28x18
-          RenderText {#text} at (3,1) size 22x16
-            text run at (3,1) width 22: "test"
-      RenderText {#text} at (274,21) size 4x19
-        text run at (274,21) width 4: " "
-      RenderButton {BUTTON} at (278,21) size 16x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (2px outset #C0C0C0)]
-      RenderText {#text} at (294,21) size 4x19
-        text run at (294,21) width 4: " "
-      RenderButton {BUTTON} at (298,21) size 38x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (2px outset #C0C0C0)]
-        RenderBlock (anonymous) at (8,2) size 22x16
-          RenderText {#text} at (0,0) size 22x16
-            text run at (0,0) width 22: "test"
-      RenderText {#text} at (0,0) size 0x0
+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 444x19

+        text run at (0,0) width 444: "This tests that empty select controls and buttons have the correct baseline."

+      RenderBR {BR} at (444,15) size 0x0

+      RenderMenuList {SELECT} at (0,21) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+        RenderBlock (anonymous) at (1,1) size 23x18

+          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+      RenderText {#text} at (25,21) size 29x19

+        text run at (25,21) width 29: " test "

+      RenderMenuList {SELECT} at (54,21) size 47x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+        RenderBlock (anonymous) at (1,1) size 45x18

+          RenderText at (4,1) size 22x16

+            text run at (4,1) width 22: "test"

+      RenderText {#text} at (101,21) size 4x19

+        text run at (101,21) width 4: " "

+      RenderMenuList {SELECT} at (105,21) size 25x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (1px solid #00008B)]

+        RenderBlock (anonymous) at (1,1) size 23x18

+          RenderBR at (4,1) size 0x16 [bgcolor=#ADD8E6]

+      RenderText {#text} at (130,21) size 29x19

+        text run at (130,21) width 29: " test "

+      RenderMenuList {SELECT} at (159,21) size 47x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (1px solid #00008B)]

+        RenderBlock (anonymous) at (1,1) size 45x18

+          RenderText at (4,1) size 22x16

+            text run at (4,1) width 22: "test"

+      RenderText {#text} at (206,21) size 4x19

+        text run at (206,21) width 4: " "

+      RenderButton {BUTTON} at (210,21) size 16x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]

+      RenderText {#text} at (226,21) size 4x19

+        text run at (226,21) width 4: " "

+      RenderButton {BUTTON} at (230,20) size 44x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]

+        RenderBlock (anonymous) at (8,2) size 28x18

+          RenderText {#text} at (3,1) size 22x16

+            text run at (3,1) width 22: "test"

+      RenderText {#text} at (274,21) size 4x19

+        text run at (274,21) width 4: " "

+      RenderButton {BUTTON} at (278,21) size 16x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (2px outset #C0C0C0)]

+      RenderText {#text} at (294,21) size 4x19

+        text run at (294,21) width 4: " "

+      RenderButton {BUTTON} at (298,21) size 38x20 [color=#00008B] [bgcolor=#ADD8E6] [border: (2px outset #C0C0C0)]

+        RenderBlock (anonymous) at (8,2) size 22x16

+          RenderText {#text} at (0,0) size 22x16

+            text run at (0,0) width 22: "test"

+      RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-empty-option-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-empty-option-height-expected.txt
index d5ef370..24e58e3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-empty-option-height-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-empty-option-height-expected.txt
@@ -1,12 +1,12 @@
-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
-      RenderMenuList {SELECT} at (0,0) size 34x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderBlock (anonymous) at (1,1) size 32x18
-          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
+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

+      RenderMenuList {SELECT} at (0,0) size 34x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+        RenderBlock (anonymous) at (1,1) size 32x18

+          RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+      RenderText {#text} at (0,0) size 0x0

+      RenderText {#text} at (0,0) size 0x0

+      RenderText {#text} at (0,0) size 0x0

+      RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/three-selects-break-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/three-selects-break-expected.txt
index 9cef985..1aae6780 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/three-selects-break-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/three-selects-break-expected.txt
@@ -1,15 +1,15 @@
-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 {DIV} at (0,0) size 5x60
-        RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-          RenderBlock (anonymous) at (1,1) size 23x18
-            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-          RenderBlock (anonymous) at (1,1) size 23x18
-            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-        RenderMenuList {SELECT} at (0,40) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-          RenderBlock (anonymous) at (1,1) size 23x18
-            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+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 {DIV} at (0,0) size 5x60

+        RenderMenuList {SELECT} at (0,0) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+          RenderBlock (anonymous) at (1,1) size 23x18

+            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+        RenderMenuList {SELECT} at (0,20) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+          RenderBlock (anonymous) at (1,1) size 23x18

+            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

+        RenderMenuList {SELECT} at (0,40) size 25x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]

+          RenderBlock (anonymous) at (1,1) size 23x18

+            RenderBR at (4,1) size 0x16 [bgcolor=#FFFFFF]

diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 8090bfd..7accab9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1805,12 +1805,6 @@ WIN : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
 WIN : LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = FAIL
 LINUX : LayoutTests/transitions/shorthand-transitions.html = FAIL
 LINUX : LayoutTests/fast/canvas/pattern-with-transform.html = CRASH
-WIN LINUX : LayoutTests/fast/forms/HTMLOptionElement_label06.html = FAIL
-WIN LINUX : LayoutTests/fast/forms/HTMLOptionElement_label07.html = FAIL
-WIN LINUX : LayoutTests/fast/forms/menulist-separator-painting.html = FAIL
-WIN LINUX : LayoutTests/fast/forms/select-baseline.html = FAIL
-WIN LINUX : LayoutTests/fast/forms/select-empty-option-height.html = FAIL
-WIN LINUX : LayoutTests/fast/replaced/three-selects-break.html = FAIL
 WIN LINUX : LayoutTests/fast/table/border-collapsing/003.html = FAIL
 WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL
 WIN LINUX : LayoutTests/http/tests/misc/acid2-pixel.html = FAIL