Rebase button tests whose output is now correct.

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

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

5 files changed, 51 insertions, 53 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.checksum
index 5811007..5f42307 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.checksum
@@ -1 +1 @@
-69c2e8b2fd1726aacab672a1d28b83f9
\ No newline at end of file
+21dacdeae627215bbf181e9ff7b307f1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.png
index 455bfbe..dbb0136 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/select-baseline-expected.png
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 6ac7436..8a10f04 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]

-      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

+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,20) size 44x22 [color=#00008B] [bgcolor=#ADD8E6] [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 (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/button-spurious-layout-hint-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/button-spurious-layout-hint-expected.txt
index 34887f4..7a3eb30 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/button-spurious-layout-hint-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/button-spurious-layout-hint-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderButton {BUTTON} at (0,0) size 100x100 [bgcolor=#FFB6C1]
-        RenderBlock (anonymous) at (6,42) size 88x16
-          RenderText {#text} at (42,0) size 4x16
-            text run at (42,0) width 4: " "
+        RenderBlock (anonymous) at (6,41) size 88x18
+          RenderText {#text} at (42,1) size 4x16
+            text run at (42,1) width 4: " "
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 9ccaaac..aaa9753 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1848,8 +1848,6 @@ MAC : LayoutTests/animations/animation-controller-drt-api.html = TIMEOUT PASS
 WIN : LayoutTests/transitions/transition-end-event-container.html = FAIL PASS
 
 // Regressions from the 41286:41362 merge.
-LINUX WIN : LayoutTests/fast/forms/select-baseline.html = FAIL
-LINUX WIN : LayoutTests/fast/repaint/button-spurious-layout-hint.html = FAIL
 LINUX WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = PASS TIMEOUT
 
 // New tests added in the 41286:41362 merge.