Rebaseline layout tests for <input type="search"> support.BUG=9210

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

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

19 files changed, 114 insertions, 111 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.checksum
index 5ef82fb..cbe0fb8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.checksum
@@ -1 +1 @@
-ea87d3be0d1c8b83bd22649c190f17ce
\ No newline at end of file
+3ac330d41c38f7d32ea1b7ab8815560b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.png
index 06b8fd2..0e97945 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.png
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..66ff5f7 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
@@ -9,18 +9,18 @@ layer at (0,0) size 800x600
       RenderTextControl {INPUT} at (0,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
       RenderText {#text} at (155,21) size 4x19
         text run at (155,21) width 4: " "
-      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
-      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)]
-      RenderText {#text} at (473,21) size 4x19
-        text run at (473,21) width 4: " "
-      RenderTextControl {INPUT} at (477,20) size 155x22 [bgcolor=#EBEBE4] [border: (2px inset #000000)]
-      RenderText {#text} at (632,21) size 4x19
-        text run at (632,21) width 4: " "
+      RenderTextControl {INPUT} at (159,20) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 151x16
+          RenderBlock {DIV} at (0,2) size 1x11
+          RenderBlock {DIV} at (139,4) size 9x9
+      RenderText {#text} at (316,21) size 4x19
+        text run at (316,21) width 4: " "
+      RenderTextControl {INPUT} at (320,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+      RenderText {#text} at (475,21) size 4x19
+        text run at (475,21) width 4: " "
+      RenderTextControl {INPUT} at (479,20) size 155x22 [bgcolor=#EBEBE4] [border: (2px inset #000000)]
+      RenderText {#text} at (634,21) size 4x19
+        text run at (634,21) width 4: " "
       RenderTextControl {INPUT} at (0,42) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
       RenderText {#text} at (155,43) size 4x19
         text run at (155,43) width 4: " "
@@ -30,15 +30,15 @@ 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 (171,31) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16 [color=#640000]
     RenderText {#text} at (1,0) size 39x16
       text run at (1,0) width 39: "search"
-layer at (328,31) size 151x16
+layer at (330,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16 [color=#640000]
     RenderText {#text} at (1,0) size 55x16
       text run at (1,0) width 55: "password"
-layer at (487,31) size 151x16
+layer at (489,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16 [color=#B80000]
     RenderText {#text} at (1,0) size 74x16
       text run at (1,0) width 74: "disabled text"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum
index 5979fad..f7c9f35 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum
@@ -1 +1 @@
-28196fa040065edb22dbbb6d30e821a1
\ No newline at end of file
+6c8cb3616d59931d9b423dcaf5386b40
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png
index 3ab4872..956f60f4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt
index 40781c8..fdc2ead 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt
@@ -12,13 +12,13 @@ layer at (0,0) size 800x600
         RenderText {#text} at (342,0) size 428x19

           text run at (342,0) width 428: ". Search field does not redraw if value set, when it has placeholder text."

       RenderBlock (anonymous) at (0,36) size 784x22

-        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

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

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

+            RenderBlock {DIV} at (0,2) size 1x11

+            RenderBlock {DIV} at (139,4) size 9x9

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

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

-layer at (10,47) size 151x16

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

+layer at (12,47) size 138x16

+  RenderBlock {DIV} at (1,0) size 138x16

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

       text run at (1,0) width 51: "New text"

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.checksum
index c744b40..8ffe20d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.checksum
@@ -1 +1 @@
-7c0e7a5480156cdf6586e10cb1f606ba
\ No newline at end of file
+9bcd4bf52ca6b5b281d8c1df5333f653
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.png
index 7cce352..31990c6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.png
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..9e2ee52 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
@@ -3,13 +3,13 @@ layer 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

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

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

+          RenderBlock {DIV} at (0,2) size 1x11

+          RenderBlock {DIV} at (139,4) size 9x9

       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]

+layer at (12,11) size 138x16

+  RenderBlock {DIV} at (1,0) size 138x16 [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.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.checksum
index c0182f6..0c0c0a9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.checksum
@@ -1 +1 @@
-2be6387b7d83c5311ed1b036ae93310c
\ No newline at end of file
+3d08c2be3b4cf746c57a44d722df58ba
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.png
index 2daceff..061e108 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/searchfield-heights-expected.png
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 e4959da..6b94d6c 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
@@ -6,30 +6,30 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 351x19
         text run at (0,0) width 351: "This tests that aqua-style search fields do not honor height."
       RenderBR {BR} at (351,15) size 0x0
-      RenderTextControl {INPUT} at (0,43) 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
-      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
-      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
+      RenderTextControl {INPUT} at (0,43) size 81x6 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 75x0
+          RenderBlock {DIV} at (0,0) size 1x11
+          RenderBlock {DIV} at (67,6) size 5x5
+      RenderText {#text} at (81,34) size 4x19
+        text run at (81,34) width 4: " "
+      RenderTextControl {INPUT} at (85,32) size 181x40 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 175x34
+          RenderBlock {DIV} at (0,3) size 1x11
+          RenderBlock {DIV} at (162,4) size 10x10
+      RenderText {#text} at (266,34) size 4x19
+        text run at (266,34) width 4: " "
+      RenderTextControl {INPUT} at (270,20) size 308x200 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 302x194
+          RenderBlock {DIV} at (0,15) size 1x11
+          RenderBlock {DIV} at (280,7) size 19x19
       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 (97,43) size 161x34
+  RenderBlock {DIV} at (1,0) size 161x34
     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 (282,31) size 279x194
+  RenderBlock {DIV} at (1,0) size 279x194
     RenderText {#text} at (1,0) size 84x32
       text run at (1,0) width 84: "regular"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.checksum
index 0581755..cd04d1c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.checksum
@@ -1 +1 @@
-2190562691115bd6b8be85c16ebda74d
\ No newline at end of file
+b66bf92960fee8508f7ce9e722fc1612
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.png
index 16b63ea..9bc440d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
index 0c3a4d3..3db1009 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
@@ -12,14 +12,14 @@ layer at (0,0) size 800x600
         RenderText {#text} at (342,0) size 306x19

           text run at (342,0) width 306: ". The cancel button in a search field fails to redraw."

       RenderBlock (anonymous) at (0,36) size 784x22

-        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

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

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

+            RenderBlock {DIV} at (0,2) size 1x11

+            RenderBlock {DIV} at (139,4) size 9x9

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

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

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

-layer at (10,47) size 151x16

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

+layer at (12,47) size 138x16

+  RenderBlock {DIV} at (1,0) size 138x16

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

       text run at (1,0) width 58: "some text"

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.checksum
index 16350a8..74b6ff9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.checksum
@@ -1 +1 @@
-170d0f02fd2bee7b35efb28c07792e22
\ No newline at end of file
+cfb01b49c10fbb9f273064a0c324272d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.png
index 762861e..35b8edb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.txt
index 69aca28..0b0cb00 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.txt
@@ -9,22 +9,22 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,20) size 784x26
         RenderTableSection {TBODY} at (0,0) size 784x26
           RenderTableRow {TR} at (0,1) size 784x24
-            RenderTableCell {TD} at (1,1) size 157x24 [r=0 c=0 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) 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
-            RenderTableCell {TD} at (159,1) size 6x24 [r=0 c=1 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) size 4x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (2,3) size 0x16
-                  RenderBlock {DIV} at (0,0) size 0x0
-                  RenderBlock {DIV} at (0,16) size 0x0
-            RenderTableCell {TD} at (166,1) size 6x24 [r=0 c=2 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) size 4x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (2,3) size 0x16
-                  RenderBlock {DIV} at (0,0) size 0x0
-                  RenderBlock {DIV} at (0,16) size 0x0
-            RenderTableCell {TD} at (173,2) size 610x22 [r=0 c=3 rs=1 cs=1]
+            RenderTableCell {TD} at (1,1) size 159x24 [r=0 c=0 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 157x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 151x16
+                  RenderBlock {DIV} at (0,2) size 1x11
+                  RenderBlock {DIV} at (139,4) size 9x9
+            RenderTableCell {TD} at (161,1) size 8x24 [r=0 c=1 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 0x16
+                  RenderBlock {DIV} at (0,0) size 1x11
+                  RenderBlock {DIV} at (0,27) size 9x9
+            RenderTableCell {TD} at (170,1) size 8x24 [r=0 c=2 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 0x16
+                  RenderBlock {DIV} at (0,0) size 1x11
+                  RenderBlock {DIV} at (0,27) size 9x9
+            RenderTableCell {TD} at (179,2) size 604x22 [r=0 c=3 rs=1 cs=1]
               RenderText {#text} at (1,1) size 4x19
                 text run at (1,1) width 4: " "
       RenderBlock (anonymous) at (0,46) size 784x40
@@ -33,45 +33,45 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,86) size 784x26
         RenderTableSection {TBODY} at (0,0) size 784x26
           RenderTableRow {TR} at (0,1) size 784x24
-            RenderTableCell {TD} at (1,1) size 637x24 [r=0 c=0 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) size 635x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (2,3) size 631x16
-                  RenderBlock {DIV} at (0,13) size 0x0
-                  RenderBlock {DIV} at (631,13) size 0x0
-            RenderTableCell {TD} at (639,1) size 6x24 [r=0 c=1 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) size 4x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (2,3) size 0x16
-                  RenderBlock {DIV} at (0,0) size 0x0
-                  RenderBlock {DIV} at (0,16) size 0x0
-            RenderTableCell {TD} at (646,1) size 6x24 [r=0 c=2 rs=1 cs=1]
-              RenderTextControl {INPUT} at (1,1) size 4x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (2,3) size 0x16
-                  RenderBlock {DIV} at (0,0) size 0x0
-                  RenderBlock {DIV} at (0,16) size 0x0
-            RenderTableCell {TD} at (653,2) size 130x22 [r=0 c=3 rs=1 cs=1]
+            RenderTableCell {TD} at (1,1) size 639x24 [r=0 c=0 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 637x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 631x16
+                  RenderBlock {DIV} at (2,0) size 18x13
+                  RenderBlock {DIV} at (619,4) size 9x9
+            RenderTableCell {TD} at (641,1) size 8x24 [r=0 c=1 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 0x16
+                  RenderBlock {DIV} at (2,0) size 18x13
+                  RenderBlock {DIV} at (0,29) size 9x9
+            RenderTableCell {TD} at (650,1) size 8x24 [r=0 c=2 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,1) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+                RenderBlock {DIV} at (3,3) size 0x16
+                  RenderBlock {DIV} at (2,0) size 18x13
+                  RenderBlock {DIV} at (0,29) size 9x9
+            RenderTableCell {TD} at (659,2) size 124x22 [r=0 c=3 rs=1 cs=1]
               RenderText {#text} at (1,1) size 4x19
                 text run at (1,1) width 4: " "
-layer at (12,33) size 151x16
-  RenderBlock {DIV} at (0,0) size 151x16
+layer at (14,33) size 138x16
+  RenderBlock {DIV} at (1,0) size 138x16
     RenderText {#text} at (1,0) size 53x16
       text run at (1,0) width 53: "New Mail"
-layer at (170,33) size 2x16 scrollWidth 35
-  RenderBlock {DIV} at (0,0) size 2x16
+layer at (173,44) size 2x16 scrollWidth 35
+  RenderBlock {DIV} at (0,11) size 2x16
     RenderText {#text} at (1,0) size 33x16
       text run at (1,0) width 33: "Reply"
-layer at (177,33) size 2x16 scrollWidth 54
-  RenderBlock {DIV} at (0,0) size 2x16
+layer at (182,44) size 2x16 scrollWidth 54
+  RenderBlock {DIV} at (0,11) size 2x16
     RenderText {#text} at (1,0) size 52x16
       text run at (1,0) width 52: "Reply All"
-layer at (12,99) size 631x16
-  RenderBlock {DIV} at (0,0) size 631x16
+layer at (36,99) size 596x16
+  RenderBlock {DIV} at (23,0) size 596x16
     RenderText {#text} at (1,0) size 53x16
       text run at (1,0) width 53: "New Mail"
-layer at (650,99) size 2x16 scrollWidth 35
-  RenderBlock {DIV} at (0,0) size 2x16
+layer at (653,112) size 2x16 scrollWidth 35
+  RenderBlock {DIV} at (0,13) size 2x16
     RenderText {#text} at (1,0) size 33x16
       text run at (1,0) width 33: "Reply"
-layer at (657,99) size 2x16 scrollWidth 54
-  RenderBlock {DIV} at (0,0) size 2x16
+layer at (662,112) size 2x16 scrollWidth 54
+  RenderBlock {DIV} at (0,13) size 2x16
     RenderText {#text} at (1,0) size 52x16
       text run at (1,0) width 52: "Reply All"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 49c4262..4cafb91 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1140,7 +1140,6 @@ LINUX : LayoutTests/fast/events/updateLayoutForHitTest.html = FAIL
 
 // Off-by-one in form controls -- font metrics?
 MAC : LayoutTests/fast/forms/input-baseline.html = FAIL
-LINUX MAC : LayoutTests/fast/forms/searchfield-heights.html = FAIL
 MAC : LayoutTests/fast/forms/textfield-outline.html = FAIL
 
 // Hebrew font metrics.
@@ -1184,9 +1183,6 @@ LINUX MAC : LayoutTests/fast/xsl/transform-xhr-doc.xhtml = FAIL
 
 MAC : LayoutTests/fast/forms/input-appearance-height.html = FAIL
 MAC : LayoutTests/fast/forms/input-text-scroll-left-on-blur.html = FAIL
-MAC : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
-MAC : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL
-MAC : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
 
 // Linux pixeltest failure: Failing to apply style
 LINUX : LayoutTests/fast/forms/select-style.html = FAIL
@@ -1401,7 +1397,6 @@ MAC : LayoutTests/fast/forms/input-text-word-wrap.html = FAIL
 MAC : LayoutTests/fast/forms/input-type-change2.html = FAIL
 MAC : LayoutTests/fast/forms/input-value.html = FAIL
 MAC : LayoutTests/fast/forms/input-width.html = FAIL
-MAC : LayoutTests/fast/forms/search-display-none-cancel-button.html = FAIL
 MAC : LayoutTests/fast/forms/tabbing-input-iframe.html = FAIL
 MAC : LayoutTests/fast/forms/textfield-drag-into-disabled.html = FAIL
 MAC : LayoutTests/fast/forms/textfield-overflow.html = FAIL
@@ -2108,7 +2103,6 @@ MAC : LayoutTests/fast/dom/HTMLElement/innerHTML-selection-crash.html = CRASH PA
 // They pass on windows given a new baseline and likely only need to be given
 // platform specific baselines for Linux and Mac.
 LINUX : LayoutTests/fast/css/percent-top-value-with-relative-position.html = FAIL
-MAC LINUX : LayoutTests/fast/repaint/search-field-cancel.html = FAIL
 
 // Looks like they started failing with r11542
 MAC : LayoutTests/fast/forms/mailto/advanced-get.html = FAIL
@@ -2133,7 +2127,6 @@ BUG9156 DEFER MAC LINUX WIN : LayoutTests/fast/js/console-non-string-values.html
 // New failures from 41613:41660 -- They likely just need to be rebaselined
 // for Mac and Linux, since that is what was done for Windows.
 BUG9157 DEFER LINUX : LayoutTests/fast/layers/normal-flow-hit-test.html = FAIL
-BUG9158 DEFER MAC LINUX : LayoutTests/fast/forms/placeholder-set-value.html = FAIL
 
 // New failures from 41660:41709
 // Newly added tests.
@@ -2358,3 +2351,13 @@ DEFER LINUX : LayoutTests/fast/forms/slider-transformed.html = FAIL
 
 // Merge WebKit: 41944:41999, Mac flaky failures.
 DEFER MAC RELEASE : LayoutTests/svg/css/glyph-orientation-rounding-test.xhtml = FAIL PASS
+
+// <input type="search">; various failures, some tests may simply need new
+// baselines, others have more problems.
+LINUX MAC : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
+BUG9158 DEFER LINUX MAC : LayoutTests/fast/forms/placeholder-set-value.html = FAIL
+LINUX MAC : LayoutTests/fast/forms/search-display-none-cancel-button.html = FAIL
+LINUX MAC : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL
+LINUX MAC : LayoutTests/fast/forms/searchfield-heights.html = FAIL
+LINUX MAC : LayoutTests/fast/repaint/search-field-cancel.html = FAIL
+LINUX MAC : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL