Two fast/form Layout tests.

Looking through the history for these two tests (both
locally and upstream) it seems these two tests stayed
the same upstream but started failing locally and got
rebaselined.

Now, they've failed again in such a way that they've
gone back to the way they were before the rebaseline. 

I asked Ojan and he thinks we weren't sure why they
changed locally, which makes me want to rebaseline
again to get to back to where we were. Especially 
since the buttons in button-default-title look more
natural this way (the label doesn't looks one pixel
too high).


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

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

7 files changed, 129 insertions, 126 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.checksum
index 078063b..7227dcb 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.checksum
@@ -1 +1 @@
-9d8f37e8a9acb3273f7cad65ffcb3bd5
\ No newline at end of file
+fa34ccc489d9ec8922411a1d2bcd9ec4
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.png
index d0e5bca..0ae7746 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.txt
index b1a167f..b35d23c 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/button-default-title-expected.txt
@@ -1,79 +1,79 @@
-layer at (0,0) size 785x668

-  RenderView at (0,0) size 785x600

-layer at (0,0) size 785x668

-  RenderBlock {HTML} at (0,0) size 785x668

-    RenderBody {BODY} at (8,8) size 769x652

-      RenderBlock {H3} at (0,0) size 769x23

-        RenderText {#text} at (0,0) size 189x22

-          text run at (0,0) width 189: "<input type=\"submit\">"

-      RenderBlock {P} at (0,41) size 769x20

-        RenderText {#text} at (0,0) size 321x19

-          text run at (0,0) width 321: "This button should have the default submit button title:"

-      RenderBlock (anonymous) at (0,77) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (11,0) size 41x16

-              text run at (11,0) width 41: "Submit"

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

-      RenderBlock {P} at (0,114) size 769x20

-        RenderText {#text} at (0,0) size 274x19

-          text run at (0,0) width 274: "This button should should have the title \"Foo\":"

-      RenderBlock (anonymous) at (0,150) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (21,0) size 22x16

-              text run at (21,0) width 22: "Foo"

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

-      RenderBlock {P} at (0,187) size 769x20

-        RenderText {#text} at (0,0) size 288x19

-          text run at (0,0) width 288: "This button should have a single space in its title:"

-      RenderBlock (anonymous) at (0,223) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (30,0) size 4x16

-              text run at (30,0) width 4: " "

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

-      RenderBlock {P} at (0,260) size 769x20

-        RenderText {#text} at (0,0) size 189x19

-          text run at (0,0) width 189: "This button should have no title:"

-      RenderBlock (anonymous) at (0,296) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

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

-      RenderBlock {H3} at (0,335) size 769x23

-        RenderText {#text} at (0,0) size 175x22

-          text run at (0,0) width 175: "<input type=\"reset\">"

-      RenderBlock {P} at (0,376) size 769x20

-        RenderText {#text} at (0,0) size 311x19

-          text run at (0,0) width 311: "This button should have the default reset button title:"

-      RenderBlock (anonymous) at (0,412) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (15,0) size 34x16

-              text run at (15,0) width 34: "Reset"

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

-      RenderBlock {P} at (0,449) size 769x20

-        RenderText {#text} at (0,0) size 274x19

-          text run at (0,0) width 274: "This button should should have the title \"Foo\":"

-      RenderBlock (anonymous) at (0,485) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (21,0) size 22x16

-              text run at (21,0) width 22: "Foo"

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

-      RenderBlock {P} at (0,522) size 769x20

-        RenderText {#text} at (0,0) size 288x19

-          text run at (0,0) width 288: "This button should have a single space in its title:"

-      RenderBlock (anonymous) at (0,558) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-          RenderBlock (anonymous) at (8,2) size 64x16

-            RenderText at (30,0) size 4x16

-              text run at (30,0) width 4: " "

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

-      RenderBlock {P} at (0,595) size 769x20

-        RenderText {#text} at (0,0) size 189x19

-          text run at (0,0) width 189: "This button should have no title:"

-      RenderBlock (anonymous) at (0,631) size 769x21

-        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]

-        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 785x668
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x668
+  RenderBlock {HTML} at (0,0) size 785x668
+    RenderBody {BODY} at (8,8) size 769x652
+      RenderBlock {H3} at (0,0) size 769x23
+        RenderText {#text} at (0,0) size 189x22
+          text run at (0,0) width 189: "<input type=\"submit\">"
+      RenderBlock {P} at (0,41) size 769x20
+        RenderText {#text} at (0,0) size 321x19
+          text run at (0,0) width 321: "This button should have the default submit button title:"
+      RenderBlock (anonymous) at (0,77) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (11,1) size 41x16
+              text run at (11,1) width 41: "Submit"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,114) size 769x20
+        RenderText {#text} at (0,0) size 274x19
+          text run at (0,0) width 274: "This button should should have the title \"Foo\":"
+      RenderBlock (anonymous) at (0,150) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (21,1) size 22x16
+              text run at (21,1) width 22: "Foo"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,187) size 769x20
+        RenderText {#text} at (0,0) size 288x19
+          text run at (0,0) width 288: "This button should have a single space in its title:"
+      RenderBlock (anonymous) at (0,223) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (30,1) size 4x16
+              text run at (30,1) width 4: " "
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,260) size 769x20
+        RenderText {#text} at (0,0) size 189x19
+          text run at (0,0) width 189: "This button should have no title:"
+      RenderBlock (anonymous) at (0,296) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {H3} at (0,335) size 769x23
+        RenderText {#text} at (0,0) size 175x22
+          text run at (0,0) width 175: "<input type=\"reset\">"
+      RenderBlock {P} at (0,376) size 769x20
+        RenderText {#text} at (0,0) size 311x19
+          text run at (0,0) width 311: "This button should have the default reset button title:"
+      RenderBlock (anonymous) at (0,412) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (15,1) size 34x16
+              text run at (15,1) width 34: "Reset"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,449) size 769x20
+        RenderText {#text} at (0,0) size 274x19
+          text run at (0,0) width 274: "This button should should have the title \"Foo\":"
+      RenderBlock (anonymous) at (0,485) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (21,1) size 22x16
+              text run at (21,1) width 22: "Foo"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,522) size 769x20
+        RenderText {#text} at (0,0) size 288x19
+          text run at (0,0) width 288: "This button should have a single space in its title:"
+      RenderBlock (anonymous) at (0,558) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 64x18
+            RenderText at (30,1) size 4x16
+              text run at (30,1) width 4: " "
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,595) size 769x20
+        RenderText {#text} at (0,0) size 189x19
+          text run at (0,0) width 189: "This button should have no title:"
+      RenderBlock (anonymous) at (0,631) size 769x21
+        RenderButton {INPUT} at (0,0) size 80x21 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        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/forms/control-clip-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.checksum
index 74b784c..9a8d5fd 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.checksum
@@ -1 +1 @@
-4406bc4f15f09a521c7932ced3e12645
\ No newline at end of file
+d57f29a7bfc490164dbef201bcd3eb3b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.png
index df24b9a..cf0a12a 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.txt
index 574baf6..c367b68 100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/control-clip-expected.txt
@@ -1,43 +1,43 @@
-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 784x576

-      RenderBlock {P} at (0,0) size 784x20

-        RenderText {#text} at (0,0) size 219x19

-          text run at (0,0) width 219: "Tests that buttons clip their contents."

-      RenderBlock {P} at (0,36) size 784x20

-        RenderText {#text} at (0,0) size 750x19

-          text run at (0,0) width 459: "Each button below should have a yellow border and a black dashed outline. "

-          text run at (459,0) width 291: "Contents should not overflow the yellow border."

-      RenderBlock {P} at (0,72) size 784x50

-        RenderButton {BUTTON} at (0,0) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]

-          RenderBlock (anonymous) at (12,12) size 76x204

-            RenderBlock {DIV} at (0,0) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]

-              RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]

-              RenderText {#text} at (12,2) size 38x64

-                text run at (12,2) width 29: "short"

-                text run at (10,18) width 34: "words"

-                text run at (15,34) width 24: "only"

-                text run at (8,50) width 38: "please"

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

-      RenderButton {BUTTON} at (0,138) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]

-        RenderBlock (anonymous) at (12,12) size 76x204

-          RenderBlock {DIV} at (0,0) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]

-            RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]

-            RenderText {#text} at (12,2) size 38x64

-              text run at (12,2) width 29: "short"

-              text run at (10,18) width 34: "words"

-              text run at (15,34) width 24: "only"

-              text run at (8,50) width 38: "please"

-      RenderBlock {P} at (0,204) size 784x0

-layer at (8,212) size 100x50

-  RenderButton {BUTTON} at (8,212) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]

-    RenderBlock (anonymous) at (12,12) size 76x204

-      RenderBlock {DIV} at (0,0) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]

-        RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]

-        RenderText {#text} at (12,2) size 38x64

-          text run at (12,2) width 29: "short"

-          text run at (10,18) width 34: "words"

-          text run at (15,34) width 24: "only"

-          text run at (8,50) width 38: "please"

+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 784x576
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 219x19
+          text run at (0,0) width 219: "Tests that buttons clip their contents."
+      RenderBlock {P} at (0,36) size 784x20
+        RenderText {#text} at (0,0) size 750x19
+          text run at (0,0) width 459: "Each button below should have a yellow border and a black dashed outline. "
+          text run at (459,0) width 291: "Contents should not overflow the yellow border."
+      RenderBlock {P} at (0,72) size 784x50
+        RenderButton {BUTTON} at (0,0) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]
+          RenderBlock (anonymous) at (12,12) size 76x206
+            RenderBlock {DIV} at (3,1) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]
+              RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]
+              RenderText {#text} at (12,2) size 38x64
+                text run at (12,2) width 29: "short"
+                text run at (10,18) width 34: "words"
+                text run at (15,34) width 24: "only"
+                text run at (8,50) width 38: "please"
+        RenderText {#text} at (0,0) size 0x0
+      RenderButton {BUTTON} at (0,138) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]
+        RenderBlock (anonymous) at (12,12) size 76x206
+          RenderBlock {DIV} at (3,1) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]
+            RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]
+            RenderText {#text} at (12,2) size 38x64
+              text run at (12,2) width 29: "short"
+              text run at (10,18) width 34: "words"
+              text run at (15,34) width 24: "only"
+              text run at (8,50) width 38: "please"
+      RenderBlock {P} at (0,204) size 784x0
+layer at (8,212) size 100x50
+  RenderButton {BUTTON} at (8,212) size 100x50 [bgcolor=#C0C0C0] [border: (2px outset #FFFF00)]
+    RenderBlock (anonymous) at (12,12) size 76x206
+      RenderBlock {DIV} at (3,1) size 74x204 [bgcolor=#008080] [border: (2px solid #800080)]
+        RenderBlock (floating) {DIV} at (52,2) size 20x100 [bgcolor=#006400]
+        RenderText {#text} at (12,2) size 38x64
+          text run at (12,2) width 29: "short"
+          text run at (10,18) width 34: "words"
+          text run at (15,34) width 24: "only"
+          text run at (8,50) width 38: "please"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 2d16f80..9ccaaac 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -318,6 +318,8 @@ LINUX : chrome/fast/forms/basic-textareas.html = FAIL
 LINUX : chrome/fast/forms/basic-textareas-quirks.html = FAIL
 LINUX MAC : LayoutTests/editing/selection/5354455-1.html = FAIL
 LINUX : LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-transformed.html = FAIL
+LINUX : LayoutTests/fast/forms/button-default-title.html = FAIL
+LINUX : LayoutTests/fast/forms/control-clip.html = FAIL
 LINUX : LayoutTests/fast/inline/inline-continuation-borders.html = FAIL
 LINUX : LayoutTests/fast/inline/vertical-align-text-bottom.html = FAIL
 MAC : LayoutTests/fast/js/switch-behaviour.html = FAIL
@@ -719,6 +721,9 @@ DEFER LINUX WIN : LayoutTests/fast/gradients/generated-gradients.html = FAIL
 DEFER LINUX WIN : LayoutTests/fast/gradients/simple-gradients.html = FAIL
 // Needs to be rebaselined. It's a new test, so shouldn't hold up release.
 DEFER LINUX : LayoutTests/fast/transforms/shadows.html = FAIL
+// This test isn't hanging, it just takes 12-13 seconds to run, which is more
+// than test_shell allows. However, we shouldn't look into the speed of the test
+// until we have reached PASS status.
 LayoutTests/http/tests/misc/acid3.html = FAIL TIMEOUT
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
@@ -1843,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/button-default-title.html = FAIL
-LINUX WIN : LayoutTests/fast/forms/control-clip.html = FAIL
 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