Five more layout tests from the 'fast' folder. The tests needed rebaselining due to small differences in font metrics and changes to form controls that have not been reflected in the baseline yet.

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

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

8 files changed, 265 insertions, 267 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
index 352c04f..9cee2eb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.checksum
@@ -1 +1 @@
-e8789a1296a2ee782d2e9deaaed200ab
\ No newline at end of file
+27d36d035366da911dbe2cfa756df763
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
index 0e3ad65..499104b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt
index 6da7d33..913dd1b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/form-element-geometry-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x630
+layer at (0,0) size 785x650
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x630
-  RenderBlock {HTML} at (0,0) size 785x630
-    RenderBody {BODY} at (8,8) size 769x614
+layer at (0,0) size 785x650
+  RenderBlock {HTML} at (0,0) size 785x650
+    RenderBody {BODY} at (8,8) size 769x634
       RenderBlock {H1} at (0,0) size 769x37
         RenderText {#text} at (0,0) size 420x36
           text run at (0,0) width 420: "Form Element Geometry Tests"
@@ -12,253 +12,253 @@ layer at (0,0) size 785x630
       RenderBlock {H2} at (0,97) size 769x27
         RenderText {#text} at (0,0) size 165x26
           text run at (0,0) width 165: "Bounding Boxes"
-      RenderTable {TABLE} at (0,143) size 166x30
-        RenderTableSection {TBODY} at (0,0) size 166x30
-          RenderTableRow {TR} at (0,2) size 166x26
-            RenderTableCell {TD} at (2,2) size 58x26 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 56x24 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 52x20
-                  RenderButton {INPUT} at (2,2) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-                    RenderBlock (anonymous) at (8,2) size 36x16
-                      RenderText at (3,1) size 30x14
-                        text run at (3,1) width 30: "button"
-            RenderTableCell {TD} at (62,3) size 62x24 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 60x22 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 56x18
-                  RenderMenuList {SELECT} at (2,2) size 56x18 [bgcolor=#FFFFFF]
-                    RenderBlock (anonymous) at (0,0) size 56x19
-                      RenderText at (8,2) size 25x14
-                        text run at (8,2) width 25: "menu"
-              RenderBlock (anonymous) at (1,23) size 60x0
+      RenderTable {TABLE} at (0,143) size 175x32
+        RenderTableSection {TBODY} at (0,0) size 175x32
+          RenderTableRow {TR} at (0,2) size 175x28
+            RenderTableCell {TD} at (2,2) size 64x28 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 62x26 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 58x22
+                  RenderButton {INPUT} at (2,2) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+                    RenderBlock (anonymous) at (8,2) size 42x18
+                      RenderText at (3,1) size 36x16
+                        text run at (3,1) width 36: "button"
+            RenderTableCell {TD} at (68,3) size 63x26 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 61x24 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 57x20
+                  RenderMenuList {SELECT} at (2,2) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+                    RenderBlock (anonymous) at (1,1) size 55x18
+                      RenderText at (4,1) size 32x16
+                        text run at (4,1) width 32: "menu"
+              RenderBlock (anonymous) at (1,25) size 61x0
                 RenderInline {FONT} at (0,0) size 0x0
-            RenderTableCell {TD} at (126,5) size 18x19 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 12x13
-                  RenderBlock {INPUT} at (2,2) size 12x13
-              RenderBlock (anonymous) at (1,18) size 16x0
+            RenderTableCell {TD} at (133,6) size 19x19 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 13x13
+                  RenderBlock {INPUT} at (2,2) size 13x13
+              RenderBlock (anonymous) at (1,18) size 17x0
                 RenderInline {FONT} at (0,0) size 0x0
-            RenderTableCell {TD} at (146,6) size 18x18 [r=0 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 12x12
-                  RenderBlock {INPUT} at (2,2) size 12x12
-              RenderBlock (anonymous) at (1,17) size 16x0
+            RenderTableCell {TD} at (154,6) size 19x19 [r=0 c=3 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 13x13
+                  RenderBlock {INPUT} at (2,2) size 13x13
+              RenderBlock (anonymous) at (1,18) size 17x0
                 RenderInline {FONT} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,173) size 166x30
-        RenderTableSection {TBODY} at (0,0) size 166x30
-          RenderTableRow {TR} at (0,2) size 166x26
-            RenderTableCell {TD} at (2,2) size 58x26 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 56x24 [border: (2px solid #0000FF)]
-                RenderButton {INPUT} at (2,2) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-                  RenderBlock (anonymous) at (8,2) size 36x16
-                    RenderText at (3,1) size 30x14
-                      text run at (3,1) width 30: "button"
-            RenderTableCell {TD} at (62,3) size 62x24 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 60x22 [border: (2px solid #0000FF)]
-                RenderMenuList {SELECT} at (2,2) size 56x18 [bgcolor=#FFFFFF]
-                  RenderBlock (anonymous) at (0,0) size 56x19
-                    RenderText at (8,2) size 25x14
-                      text run at (8,2) width 25: "menu"
-            RenderTableCell {TD} at (126,5) size 18x19 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
-                RenderBlock {INPUT} at (2,2) size 12x13
-            RenderTableCell {TD} at (146,6) size 18x18 [r=0 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
-                RenderBlock {INPUT} at (2,2) size 12x12
-      RenderTable {TABLE} at (0,203) size 166x30
-        RenderTableSection {TBODY} at (0,0) size 166x30
-          RenderTableRow {TR} at (0,2) size 166x26
-            RenderTableCell {TD} at (2,2) size 58x26 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 56x24 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 52x12
-                  RenderButton {INPUT} at (2,2) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-                    RenderBlock (anonymous) at (8,2) size 36x16
-                      RenderText at (3,1) size 30x14
-                        text run at (3,1) width 30: "button"
-            RenderTableCell {TD} at (62,3) size 62x24 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 60x22 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 56x12
-                  RenderMenuList {SELECT} at (2,2) size 56x18 [bgcolor=#FFFFFF]
-                    RenderBlock (anonymous) at (0,0) size 56x19
-                      RenderText at (8,2) size 25x14
-                        text run at (8,2) width 25: "menu"
-            RenderTableCell {TD} at (126,5) size 18x19 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 12x10
-                  RenderBlock {INPUT} at (2,2) size 12x13
-            RenderTableCell {TD} at (146,6) size 18x18 [r=0 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 16x16 [border: (2px solid #0000FF)]
-                RenderInline {FONT} at (0,0) size 12x10
-                  RenderBlock {INPUT} at (2,2) size 12x12
-      RenderTable {TABLE} at (0,233) size 498x71
-        RenderTableSection {TBODY} at (0,0) size 498x71
-          RenderTableRow {TR} at (0,2) size 498x67
-            RenderTableCell {TD} at (2,2) size 76x26 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 74x24 [border: (2px solid #0000FF)]
-                RenderTextControl {INPUT} at (2,2) size 70x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-            RenderTableCell {TD} at (80,2) size 37x67 [r=0 c=1 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 35x65 [border: (2px solid #0000FF)]
-                RenderListBox {SELECT} at (2,2) size 31x61 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
-            RenderTableCell {TD} at (119,2) size 210x26 [r=0 c=2 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 208x24 [border: (2px solid #0000FF)]
-                RenderFileUploadControl {INPUT} at (2,2) size 204x20
-                  RenderButton {INPUT} at (0,0) size 76x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-                    RenderBlock (anonymous) at (8,2) size 60x16
-                      RenderText at (3,1) size 54x14
-                        text run at (3,1) width 54: "Choose File"
-            RenderTableCell {TD} at (331,2) size 165x40 [r=0 c=3 rs=1 cs=1]
-              RenderBlock {DIV} at (1,1) size 163x38 [border: (2px solid #0000FF)]
-      RenderBlock {H2} at (0,323) size 769x27
+      RenderTable {TABLE} at (0,175) size 175x32
+        RenderTableSection {TBODY} at (0,0) size 175x32
+          RenderTableRow {TR} at (0,2) size 175x28
+            RenderTableCell {TD} at (2,2) size 64x28 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 62x26 [border: (2px solid #0000FF)]
+                RenderButton {INPUT} at (2,2) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+                  RenderBlock (anonymous) at (8,2) size 42x18
+                    RenderText at (3,1) size 36x16
+                      text run at (3,1) width 36: "button"
+            RenderTableCell {TD} at (68,3) size 63x26 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 61x24 [border: (2px solid #0000FF)]
+                RenderMenuList {SELECT} at (2,2) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+                  RenderBlock (anonymous) at (1,1) size 55x18
+                    RenderText at (4,1) size 32x16
+                      text run at (4,1) width 32: "menu"
+            RenderTableCell {TD} at (133,6) size 19x19 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderBlock {INPUT} at (2,2) size 13x13
+            RenderTableCell {TD} at (154,6) size 19x19 [r=0 c=3 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderBlock {INPUT} at (2,2) size 13x13
+      RenderTable {TABLE} at (0,207) size 175x32
+        RenderTableSection {TBODY} at (0,0) size 175x32
+          RenderTableRow {TR} at (0,2) size 175x28
+            RenderTableCell {TD} at (2,2) size 64x28 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 62x26 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 58x12
+                  RenderButton {INPUT} at (2,2) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+                    RenderBlock (anonymous) at (8,2) size 42x18
+                      RenderText at (3,1) size 36x16
+                        text run at (3,1) width 36: "button"
+            RenderTableCell {TD} at (68,3) size 63x26 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 61x24 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 57x12
+                  RenderMenuList {SELECT} at (2,2) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+                    RenderBlock (anonymous) at (1,1) size 55x18
+                      RenderText at (4,1) size 32x16
+                        text run at (4,1) width 32: "menu"
+            RenderTableCell {TD} at (133,6) size 19x19 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 13x10
+                  RenderBlock {INPUT} at (2,2) size 13x13
+            RenderTableCell {TD} at (154,6) size 19x19 [r=0 c=3 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 17x17 [border: (2px solid #0000FF)]
+                RenderInline {FONT} at (0,0) size 13x10
+                  RenderBlock {INPUT} at (2,2) size 13x13
+      RenderTable {TABLE} at (0,239) size 580x79
+        RenderTableSection {TBODY} at (0,0) size 580x79
+          RenderTableRow {TR} at (0,2) size 580x75
+            RenderTableCell {TD} at (2,2) size 101x28 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 99x26 [border: (2px solid #0000FF)]
+                RenderTextControl {INPUT} at (2,2) size 95x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+            RenderTableCell {TD} at (105,2) size 40x75 [r=0 c=1 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 38x73 [border: (2px solid #0000FF)]
+                RenderListBox {SELECT} at (2,2) size 34x69 [bgcolor=#FFFFFF] [border: (1px inset #808080)]
+            RenderTableCell {TD} at (147,2) size 244x28 [r=0 c=2 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 242x26 [border: (2px solid #0000FF)]
+                RenderFileUploadControl {INPUT} at (2,2) size 238x22
+                  RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+                    RenderBlock (anonymous) at (8,2) size 75x18
+                      RenderText at (3,1) size 69x16
+                        text run at (3,1) width 69: "Choose File"
+            RenderTableCell {TD} at (393,2) size 185x44 [r=0 c=3 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 183x42 [border: (2px solid #0000FF)]
+      RenderBlock {H2} at (0,337) size 769x27
         RenderText {#text} at (0,0) size 199x26
           text run at (0,0) width 199: "Baseline Alignment"
-      RenderBlock {DIV} at (0,369) size 769x28
-        RenderInline {FONT} at (0,0) size 208x27
+      RenderBlock {DIV} at (0,383) size 769x28
+        RenderInline {FONT} at (0,0) size 217x27
           RenderText {#text} at (0,0) size 43x27
             text run at (0,0) width 43: "text "
-          RenderButton {INPUT} at (43,7) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-            RenderBlock (anonymous) at (8,2) size 36x16
-              RenderText at (3,1) size 30x14
-                text run at (3,1) width 30: "button"
-          RenderText {#text} at (95,0) size 6x27
-            text run at (95,0) width 6: " "
-          RenderMenuList {SELECT} at (101,8) size 56x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 56x19
-              RenderText at (8,2) size 25x14
-                text run at (8,2) width 25: "menu"
-          RenderText {#text} at (157,0) size 6x27
-            text run at (157,0) width 6: " "
-          RenderBlock {INPUT} at (168,8) size 12x13
-          RenderText {#text} at (183,0) size 6x27
-            text run at (183,0) width 6: " "
-          RenderBlock {INPUT} at (193,9) size 12x12
+          RenderButton {INPUT} at (43,5) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+            RenderBlock (anonymous) at (8,2) size 42x18
+              RenderText at (3,1) size 36x16
+                text run at (3,1) width 36: "button"
+          RenderText {#text} at (101,0) size 6x27
+            text run at (101,0) width 6: " "
+          RenderMenuList {SELECT} at (107,6) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 55x18
+              RenderText at (4,1) size 32x16
+                text run at (4,1) width 32: "menu"
+          RenderText {#text} at (164,0) size 6x27
+            text run at (164,0) width 6: " "
+          RenderBlock {INPUT} at (175,8) size 13x13
+          RenderText {#text} at (191,0) size 6x27
+            text run at (191,0) width 6: " "
+          RenderBlock {INPUT} at (201,8) size 13x13
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,397) size 769x22
+      RenderBlock {DIV} at (0,411) size 769x22
         RenderText {#text} at (0,1) size 26x19
           text run at (0,1) width 26: "text "
-        RenderButton {INPUT} at (26,2) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-          RenderBlock (anonymous) at (8,2) size 36x16
-            RenderText at (3,1) size 30x14
-              text run at (3,1) width 30: "button"
-        RenderText {#text} at (78,1) size 4x19
-          text run at (78,1) width 4: " "
-        RenderMenuList {SELECT} at (82,3) size 56x18 [bgcolor=#FFFFFF]
-          RenderBlock (anonymous) at (0,0) size 56x19
-            RenderText at (8,2) size 25x14
-              text run at (8,2) width 25: "menu"
-        RenderText {#text} at (138,1) size 4x19
-          text run at (138,1) width 4: " "
-        RenderBlock {INPUT} at (147,3) size 12x13
-        RenderText {#text} at (162,1) size 4x19
-          text run at (162,1) width 4: " "
-        RenderBlock {INPUT} at (170,4) size 12x12
+        RenderButton {INPUT} at (26,0) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (8,2) size 42x18
+            RenderText at (3,1) size 36x16
+              text run at (3,1) width 36: "button"
+        RenderText {#text} at (84,1) size 4x19
+          text run at (84,1) width 4: " "
+        RenderMenuList {SELECT} at (88,1) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+          RenderBlock (anonymous) at (1,1) size 55x18
+            RenderText at (4,1) size 32x16
+              text run at (4,1) width 32: "menu"
+        RenderText {#text} at (145,1) size 4x19
+          text run at (145,1) width 4: " "
+        RenderBlock {INPUT} at (154,3) size 13x13
+        RenderText {#text} at (170,1) size 4x19
+          text run at (170,1) width 4: " "
+        RenderBlock {INPUT} at (178,3) size 13x13
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,419) size 769x22
-        RenderInline {FONT} at (0,0) size 174x12
+      RenderBlock {DIV} at (0,433) size 769x22
+        RenderInline {FONT} at (0,0) size 183x12
           RenderText {#text} at (0,6) size 18x12
             text run at (0,6) width 18: "text "
-          RenderButton {INPUT} at (18,2) size 52x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-            RenderBlock (anonymous) at (8,2) size 36x16
-              RenderText at (3,1) size 30x14
-                text run at (3,1) width 30: "button"
-          RenderText {#text} at (70,6) size 3x12
-            text run at (70,6) width 3: " "
-          RenderMenuList {SELECT} at (73,3) size 56x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 56x19
-              RenderText at (8,2) size 25x14
-                text run at (8,2) width 25: "menu"
-          RenderText {#text} at (129,6) size 3x12
-            text run at (129,6) width 3: " "
-          RenderBlock {INPUT} at (137,3) size 12x13
-          RenderText {#text} at (152,6) size 3x12
-            text run at (152,6) width 3: " "
-          RenderBlock {INPUT} at (159,4) size 12x12
+          RenderButton {INPUT} at (18,0) size 58x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+            RenderBlock (anonymous) at (8,2) size 42x18
+              RenderText at (3,1) size 36x16
+                text run at (3,1) width 36: "button"
+          RenderText {#text} at (76,6) size 3x12
+            text run at (76,6) width 3: " "
+          RenderMenuList {SELECT} at (79,1) size 57x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 55x18
+              RenderText at (4,1) size 32x16
+                text run at (4,1) width 32: "menu"
+          RenderText {#text} at (136,6) size 3x12
+            text run at (136,6) width 3: " "
+          RenderBlock {INPUT} at (144,3) size 13x13
+          RenderText {#text} at (160,6) size 3x12
+            text run at (160,6) width 3: " "
+          RenderBlock {INPUT} at (167,3) size 13x13
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,441) size 769x42
-        RenderText {#text} at (0,19) size 26x19
-          text run at (0,19) width 26: "text "
-        RenderTextControl {INPUT} at (26,20) size 70x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderText {#text} at (96,19) size 4x19
-          text run at (96,19) width 4: " "
-        RenderFileUploadControl {INPUT} at (102,20) size 204x20
-          RenderButton {INPUT} at (0,0) size 76x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
-            RenderBlock (anonymous) at (8,2) size 60x16
-              RenderText at (3,1) size 54x14
-                text run at (3,1) width 54: "Choose File"
-        RenderText {#text} at (308,19) size 4x19
-          text run at (308,19) width 4: " "
+      RenderBlock {DIV} at (0,455) size 769x46
+        RenderText {#text} at (0,23) size 26x19
+          text run at (0,23) width 26: "text "
+        RenderTextControl {INPUT} at (26,22) size 95x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (121,23) size 4x19
+          text run at (121,23) width 4: " "
+        RenderFileUploadControl {INPUT} at (127,22) size 238x22
+          RenderButton {INPUT} at (0,0) size 91x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+            RenderBlock (anonymous) at (8,2) size 75x18
+              RenderText at (3,1) size 69x16
+                text run at (3,1) width 69: "Choose File"
+        RenderText {#text} at (367,23) size 4x19
+          text run at (367,23) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {H2} at (0,502) size 769x27
+      RenderBlock {H2} at (0,520) size 769x27
         RenderText {#text} at (0,0) size 195x26
           text run at (0,0) width 195: "Pop-up Menu Sizes"
-      RenderBlock {DIV} at (0,548) size 769x28
-        RenderInline {FONT} at (0,0) size 163x27
+      RenderBlock {DIV} at (0,566) size 769x28
+        RenderInline {FONT} at (0,0) size 146x27
           RenderText {#text} at (0,0) size 0x0
-          RenderMenuList {SELECT} at (0,8) size 36x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 36x19
-              RenderBR at (8,2) size 0x14 [bgcolor=#FFFFFF]
-          RenderText {#text} at (36,0) size 6x27
-            text run at (36,0) width 6: " "
-          RenderMenuList {SELECT} at (42,8) size 36x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 36x19
-              RenderText at (8,2) size 2x14
-                text run at (8,2) width 2: "|"
-          RenderText {#text} at (78,0) size 6x27
-            text run at (78,0) width 6: " "
-          RenderMenuList {SELECT} at (84,8) size 79x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 79x19
-              RenderText at (8,2) size 48x14
-                text run at (8,2) width 48: "xxxxxxxx"
+          RenderMenuList {SELECT} at (0,6) 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,0) size 6x27
+            text run at (25,0) width 6: " "
+          RenderMenuList {SELECT} at (31,6) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 26x18
+              RenderText at (4,1) size 3x16
+                text run at (4,1) width 3: "|"
+          RenderText {#text} at (59,0) size 6x27
+            text run at (59,0) width 6: " "
+          RenderMenuList {SELECT} at (65,6) size 81x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 79x18
+              RenderText at (4,1) size 56x16
+                text run at (4,1) width 56: "xxxxxxxx"
           RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,576) size 769x20
-        RenderMenuList {SELECT} at (0,2) size 36x18 [bgcolor=#FFFFFF]
-          RenderBlock (anonymous) at (0,0) size 36x19
-            RenderBR at (8,2) size 0x14 [bgcolor=#FFFFFF]
-        RenderText {#text} at (36,0) size 4x19
-          text run at (36,0) width 4: " "
-        RenderMenuList {SELECT} at (40,2) size 36x18 [bgcolor=#FFFFFF]
-          RenderBlock (anonymous) at (0,0) size 36x19
-            RenderText at (8,2) size 2x14
-              text run at (8,2) width 2: "|"
-        RenderText {#text} at (76,0) size 4x19
-          text run at (76,0) width 4: " "
-        RenderMenuList {SELECT} at (80,2) size 79x18 [bgcolor=#FFFFFF]
-          RenderBlock (anonymous) at (0,0) size 79x19
-            RenderText at (8,2) size 48x14
-              text run at (8,2) width 48: "xxxxxxxx"
+      RenderBlock {DIV} at (0,594) size 769x20
+        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)]
+        RenderText {#text} at (25,0) size 4x19
+          text run at (25,0) width 4: " "
+        RenderMenuList {SELECT} at (29,0) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+          RenderBlock (anonymous) at (1,1) size 26x18
+            RenderText at (4,1) size 3x16
+              text run at (4,1) width 3: "|"
+        RenderText {#text} at (57,0) size 4x19
+          text run at (57,0) width 4: " "
+        RenderMenuList {SELECT} at (61,0) size 81x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+          RenderBlock (anonymous) at (1,1) size 79x18
+            RenderText at (4,1) size 56x16
+              text run at (4,1) width 56: "xxxxxxxx"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (0,596) size 769x18
-        RenderInline {FONT} at (0,0) size 157x12
+      RenderBlock {DIV} at (0,614) size 769x20
+        RenderInline {FONT} at (0,0) size 140x12
           RenderText {#text} at (0,0) size 0x0
-          RenderMenuList {SELECT} at (0,0) size 36x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 36x19
-              RenderBR at (8,2) size 0x14 [bgcolor=#FFFFFF]
-          RenderText {#text} at (36,3) size 3x12
-            text run at (36,3) width 3: " "
-          RenderMenuList {SELECT} at (39,0) size 36x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 36x19
-              RenderText at (8,2) size 2x14
-                text run at (8,2) width 2: "|"
-          RenderText {#text} at (75,3) size 3x12
-            text run at (75,3) width 3: " "
-          RenderMenuList {SELECT} at (78,0) size 79x18 [bgcolor=#FFFFFF]
-            RenderBlock (anonymous) at (0,0) size 79x19
-              RenderText at (8,2) size 48x14
-                text run at (8,2) width 48: "xxxxxxxx"
+          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)]
+          RenderText {#text} at (25,5) size 3x12
+            text run at (25,5) width 3: " "
+          RenderMenuList {SELECT} at (28,0) size 28x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 26x18
+              RenderText at (4,1) size 3x16
+                text run at (4,1) width 3: "|"
+          RenderText {#text} at (56,5) size 3x12
+            text run at (56,5) width 3: " "
+          RenderMenuList {SELECT} at (59,0) size 81x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+            RenderBlock (anonymous) at (1,1) size 79x18
+              RenderText at (4,1) size 56x16
+                text run at (4,1) width 56: "xxxxxxxx"
           RenderText {#text} at (0,0) size 0x0
-layer at (15,249) size 66x14
-  RenderBlock {DIV} at (2,3) size 66x14
-    RenderText {#text} at (1,0) size 42x14
-      text run at (1,0) width 42: "text field"
-layer at (342,247) size 159x32 clip at (343,248) size 157x30
-  RenderTextControl {TEXTAREA} at (2,3) size 159x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 138x14
-      RenderText {#text} at (0,0) size 56x14
-        text run at (0,0) width 56: "textarea"
-layer at (36,472) size 66x14
-  RenderBlock {DIV} at (2,3) size 66x14
-    RenderText {#text} at (1,0) size 42x14
-      text run at (1,0) width 42: "text field"
-layer at (320,450) size 159x32 clip at (321,451) size 157x30
-  RenderTextControl {TEXTAREA} at (312,1) size 159x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 138x14
-      RenderText {#text} at (0,0) size 56x14
-        text run at (0,0) width 56: "textarea"
+layer at (15,255) size 91x16
+  RenderBlock {DIV} at (2,3) size 91x16
+    RenderText {#text} at (1,0) size 49x16
+      text run at (1,0) width 49: "text field"
+layer at (404,253) size 179x36 clip at (405,254) size 177x34
+  RenderTextControl {TEXTAREA} at (2,3) size 179x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock {DIV} at (3,3) size 158x16
+      RenderText {#text} at (0,0) size 64x16
+        text run at (0,0) width 64: "textarea"
+layer at (36,488) size 91x16
+  RenderBlock {DIV} at (2,3) size 91x16
+    RenderText {#text} at (1,0) size 49x16
+      text run at (1,0) width 49: "text field"
+layer at (379,464) size 179x36 clip at (380,465) size 177x34
+  RenderTextControl {TEXTAREA} at (371,1) size 179x36 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+    RenderBlock {DIV} at (3,3) size 158x16
+      RenderText {#text} at (0,0) size 64x16
+        text run at (0,0) width 64: "textarea"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
index 986f5d6..c3ec6de6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
@@ -88,7 +88,7 @@ layer at (0,0) size 800x600
         RenderTextControl {INPUT} at (43,247) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderBlock {DIV} at (2,3) size 151x16
             RenderBlock {DIV} at (0,13) size 0x0
-            RenderBlock {DIV} at (151,13) size 0x0
+            RenderBlock {DIV} at (148,13) size 0x0
         RenderText {#text} at (0,0) size 0x0
 layer at (43,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
@@ -98,7 +98,7 @@ layer at (58,232) size 151x16
   RenderBlock {DIV} at (3,3) size 151x16
 layer at (73,256) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (53,278) size 151x16
-  RenderBlock {DIV} at (0,0) size 151x16
+layer at (53,278) size 148x16
+  RenderBlock {DIV} at (0,0) size 148x16
 layer at (47,170) size 129x16
   RenderBlock (relative positioned) {DIV} at (0,0) size 129x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
index 7aae2a6..cc2ee52 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 800x600
       RenderTextControl {INPUT} at (159,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderBlock {DIV} at (2,3) size 151x16
           RenderBlock {DIV} at (0,13) size 0x0
-          RenderBlock {DIV} at (151,13) size 0x0
+          RenderBlock {DIV} at (148,13) size 0x0
       RenderText {#text} at (314,21) size 4x19
         text run at (314,21) width 4: " "
       RenderTextControl {INPUT} at (318,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
@@ -30,8 +30,8 @@ layer at (10,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16 [color=#640000]
     RenderText {#text} at (1,0) size 22x16
       text run at (1,0) width 22: "text"
-layer at (169,31) size 151x16
-  RenderBlock {DIV} at (0,0) size 151x16 [color=#640000]
+layer at (169,31) size 148x16
+  RenderBlock {DIV} at (0,0) size 148x16 [color=#640000]
     RenderText {#text} at (1,0) size 39x16
       text run at (1,0) width 39: "search"
 layer at (328,31) size 151x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt
index 6e53ac5..5c994ad 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-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

-      RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

-        RenderBlock {DIV} at (2,3) size 151x16

-          RenderBlock {DIV} at (0,13) size 0x0

-          RenderBlock {DIV} at (151,13) size 0x0

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

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

-layer at (10,11) size 151x16

-  RenderBlock {DIV} at (0,0) size 151x16 [color=#A9A9A9]

-    RenderText {#text} at (1,0) size 73x16

-      text run at (1,0) width 73: "Test Passed"

+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
+      RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (2,3) size 151x16
+          RenderBlock {DIV} at (0,13) size 0x0
+          RenderBlock {DIV} at (148,13) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (10,11) size 148x16
+  RenderBlock {DIV} at (0,0) size 148x16 [color=#A9A9A9]
+    RenderText {#text} at (1,0) size 73x16
+      text run at (1,0) width 73: "Test Passed"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.txt
index df5a9c5..405550e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.txt
@@ -9,27 +9,27 @@ layer at (0,0) size 800x600
       RenderTextControl {INPUT} at (0,46) size 79x6 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderBlock {DIV} at (2,3) size 75x0
           RenderBlock {DIV} at (0,0) size 0x0
-          RenderBlock {DIV} at (75,0) size 0x0
+          RenderBlock {DIV} at (72,0) size 0x0
       RenderText {#text} at (79,34) size 4x19
         text run at (79,34) width 4: " "
       RenderTextControl {INPUT} at (83,32) size 179x40 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderBlock {DIV} at (2,3) size 175x34
           RenderBlock {DIV} at (0,14) size 0x0
-          RenderBlock {DIV} at (175,14) size 0x0
+          RenderBlock {DIV} at (172,14) size 0x0
       RenderText {#text} at (262,34) size 4x19
         text run at (262,34) width 4: " "
       RenderTextControl {INPUT} at (266,20) size 306x200 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderBlock {DIV} at (2,3) size 302x194
           RenderBlock {DIV} at (0,26) size 0x0
-          RenderBlock {DIV} at (302,26) size 0x0
+          RenderBlock {DIV} at (299,26) 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 (93,43) size 175x34
-  RenderBlock {DIV} at (0,0) size 175x34
+layer at (93,43) size 172x34
+  RenderBlock {DIV} at (0,0) size 172x34
     RenderText {#text} at (1,0) size 35x17
       text run at (1,0) width 35: "small"
-layer at (276,31) size 302x194
-  RenderBlock {DIV} at (0,0) size 302x194
+layer at (276,31) size 299x194
+  RenderBlock {DIV} at (0,0) size 299x194
     RenderText {#text} at (1,0) size 84x32
       text run at (1,0) width 84: "regular"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index b5fcd58..f84637b 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -338,6 +338,10 @@ LINUX : LayoutTests/fast/backgrounds/svg-as-background-4.html = FAIL
 LINUX : LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL CRASH
 DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
 LINUX MAC : LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = FAIL
+LINUX MAC : LayoutTests/fast/forms/form-element-geometry.html = FAIL
+LINUX : LayoutTests/fast/forms/input-appearance-height.html = FAIL
+LINUX : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
+LINUX : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL
 MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
 LINUX : LayoutTests/fast/text/international/001.html = FAIL
 LINUX : LayoutTests/fast/text/international/002.html = FAIL
@@ -1071,8 +1075,6 @@ LayoutTests/fast/forms/selection-functions.html = FAIL
 // MERGE REGRESSIONS 36102:37604
 
 LINUX : LayoutTests/fast/events/mouse-click-events.html = FAIL
-// The thumb in the scrollbar looks wrong.  It looks too narrow.
-LayoutTests/fast/forms/form-element-geometry.html = FAIL
 // The list box selection is wrong, the focus ring is wrong, and the thumb in
 // the scrollbar looks too narrow.
 LINUX WIN : LayoutTests/fast/forms/listbox-deselect-scroll.html = FAIL
@@ -1785,10 +1787,6 @@ LINUX : LayoutTests/svg/custom/struct-use-09-b.svg = FAIL
 
 // Merge 39913:39933 - regressions
 // See http://crbug.com/6482
-WIN : LayoutTests/fast/forms/searchfield-heights.html = FAIL
-LINUX WIN : LayoutTests/fast/forms/input-appearance-height.html = FAIL
-LINUX WIN : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
-LINUX WIN : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL
 LINUX WIN : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
 
 // Passes locally but Text diff fails on the buildbots