Rebaseline tests due to the merge 44805:44837.

The majority of these have to do http://trac.webkit.org/changeset/44806 which did a vertical alignment change.

become-overlay-composited-layer is a new result due to a new test added by http://trac.webkit.org/changeset/44817.


BUG=None
TEST=None
TBR=paulg


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

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

23 files changed, 249 insertions, 58 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum
new file mode 100644
index 0000000..cfd7f66
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum
@@ -0,0 +1 @@
+4258e7c5a5c21ed153c7dbeb926a3932
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt
new file mode 100644
index 0000000..b9a02c4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderInline {A} at (0,0) size 146x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 146x19
+            text run at (0,0) width 146: "rdar://problem/6983207"
+        RenderText {#text} at (146,0) size 374x19
+          text run at (146,0) width 374: "Should not leave blue box behind after moving to the top right."
+layer at (8,44) size 502x102
+  RenderBlock (relative positioned) {DIV} at (0,36) size 502x102 [border: (1px solid #000000)]
+layer at (9,145) size 250x100
+  RenderBlock (positioned) {DIV} at (1,101) size 250x100 [bgcolor=#0000FF]
+layer at (9,45) size 50x50
+  RenderBlock (positioned) {DIV} at (1,1) size 50x50 [bgcolor=#000000]
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum
new file mode 100644
index 0000000..1f88df8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum
@@ -0,0 +1 @@
+dcc962314c80e320fb697320a92f7f92
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.png
new file mode 100644
index 0000000..52abdd1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.txt
new file mode 100644
index 0000000..d38618d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-vertical-alignment-expected.txt
@@ -0,0 +1,63 @@
+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 784x40
+        RenderText {#text} at (0,0) size 784x39
+          text run at (0,0) width 398: "Test that search field text is vertically centered if the search field is "
+          text run at (398,0) width 386: "taller than the text. In each of the following pairs of a search field"
+          text run at (0,20) width 26: "and "
+          text run at (26,20) width 338: "a text field, the vertical position of the text should be the "
+          text run at (364,20) width 115: "same in both fields."
+      RenderBlock {P} at (0,56) size 784x45
+        RenderTextControl {INPUT} at (2,0) size 157x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,14) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,12) size 4x19
+          text run at (161,12) width 4: " "
+        RenderTextControl {INPUT} at (167,0) size 155x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,117) size 784x21
+        RenderTextControl {INPUT} at (2,0) size 157x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,1) size 4x19
+          text run at (161,1) width 4: " "
+        RenderTextControl {INPUT} at (167,0) size 155x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,154) size 784x20
+        RenderTextControl {INPUT} at (2,3) size 157x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x6
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,0) size 4x19
+          text run at (161,0) width 4: " "
+        RenderTextControl {INPUT} at (167,3) size 155x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (31,78) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,78) size 151x16
+  RenderBlock {DIV} at (2,14) size 151x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (31,128) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,128) size 151x16
+  RenderBlock {DIV} at (2,3) size 151x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (31,168) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,168) size 151x6 scrollHeight 16
+  RenderBlock {DIV} at (2,3) size 151x6
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.checksum
index cf67c52..753c470 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.checksum
@@ -1 +1 @@
-ecd729cfdd3f9da9dee0978d6ce39772
\ No newline at end of file
+eb17cec7ebac14299a9e109936a7e849
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.png
index 8d8d49b..ac03e8d 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.txt
new file mode 100644
index 0000000..5a04dd4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/search-zoomed-expected.txt
@@ -0,0 +1,30 @@
+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 (9,9) size 782x572
+      RenderBlock {P} at (0,0) size 782x44
+        RenderText {#text} at (0,0) size 65x21
+          text run at (0,0) width 65: "Test for "
+        RenderInline {A} at (0,0) size 359x21 [color=#0000EE]
+          RenderText {#text} at (65,0) size 359x21
+            text run at (65,0) width 359: "https://bugs.webkit.org/show_bug.cgi?id=24733"
+        RenderText {#text} at (424,0) size 4x21
+          text run at (424,0) width 4: ":"
+        RenderBR {BR} at (428,16) size 0x0
+        RenderText {#text} at (0,22) size 362x21
+          text run at (0,22) width 362: "Tests event handling on search fields with zoom."
+      RenderBlock {P} at (0,63) size 782x29
+        RenderTextControl {INPUT} at (2,2) size 184x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,2) size 178x20
+            RenderBlock {DIV} at (2,0) size 22x16
+            RenderBlock {DIV} at (164,5) size 11x11
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,164) size 782x22
+        RenderText {#text} at (0,0) size 46x21
+          text run at (0,0) width 46: "PASS"
+layer at (41,77) size 137x19
+  RenderBlock {DIV} at (27,1) size 137x19
+    RenderText {#text} at (1,0) size 109x18
+      text run at (1,0) width 109: "Some other text"
+caret: position 15 of child 0 {#text} of child 1 {DIV} of child 0 {DIV} of child 1 {INPUT} of child 3 {P} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum
new file mode 100644
index 0000000..4ce4b3b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.checksum
@@ -0,0 +1 @@
+a9a79aff5adf0dd74ef57f7fcb5b9e57
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt
new file mode 100644
index 0000000..b9a02c4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/repaint/become-overlay-composited-layer-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderInline {A} at (0,0) size 146x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 146x19
+            text run at (0,0) width 146: "rdar://problem/6983207"
+        RenderText {#text} at (146,0) size 374x19
+          text run at (146,0) width 374: "Should not leave blue box behind after moving to the top right."
+layer at (8,44) size 502x102
+  RenderBlock (relative positioned) {DIV} at (0,36) size 502x102 [border: (1px solid #000000)]
+layer at (9,145) size 250x100
+  RenderBlock (positioned) {DIV} at (1,101) size 250x100 [bgcolor=#0000FF]
+layer at (9,45) size 50x50
+  RenderBlock (positioned) {DIV} at (1,1) size 50x50 [bgcolor=#000000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum
new file mode 100644
index 0000000..df8c523
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.checksum
@@ -0,0 +1 @@
+cf26569006e947d60a9087fd749b5ec3
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.png
new file mode 100644
index 0000000..0f11978
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.txt
new file mode 100644
index 0000000..d38618d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-vertical-alignment-expected.txt
@@ -0,0 +1,63 @@
+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 784x40
+        RenderText {#text} at (0,0) size 784x39
+          text run at (0,0) width 398: "Test that search field text is vertically centered if the search field is "
+          text run at (398,0) width 386: "taller than the text. In each of the following pairs of a search field"
+          text run at (0,20) width 26: "and "
+          text run at (26,20) width 338: "a text field, the vertical position of the text should be the "
+          text run at (364,20) width 115: "same in both fields."
+      RenderBlock {P} at (0,56) size 784x45
+        RenderTextControl {INPUT} at (2,0) size 157x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,14) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,12) size 4x19
+          text run at (161,12) width 4: " "
+        RenderTextControl {INPUT} at (167,0) size 155x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,117) size 784x21
+        RenderTextControl {INPUT} at (2,0) size 157x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x16
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,1) size 4x19
+          text run at (161,1) width 4: " "
+        RenderTextControl {INPUT} at (167,0) size 155x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,154) size 784x20
+        RenderTextControl {INPUT} at (2,3) size 157x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,3) size 151x6
+            RenderBlock {DIV} at (2,0) size 13x13
+            RenderBlock {DIV} at (139,4) size 9x9
+        RenderText {#text} at (161,0) size 4x19
+          text run at (161,0) width 4: " "
+        RenderTextControl {INPUT} at (167,3) size 155x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (31,78) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,78) size 151x16
+  RenderBlock {DIV} at (2,14) size 151x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (31,128) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,128) size 151x16
+  RenderBlock {DIV} at (2,3) size 151x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (31,168) size 121x16
+  RenderBlock {DIV} at (18,0) size 121x16
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
+layer at (177,168) size 151x6 scrollHeight 16
+  RenderBlock {DIV} at (2,3) size 151x6
+    RenderText {#text} at (1,0) size 25x16
+      text run at (1,0) width 25: "Text"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum
index f1134c4c..c0eb49c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.checksum
@@ -1 +1 @@
-873eb001b2fcaa19821a55af87092293
\ No newline at end of file
+9567920f2a230a6776ba1b100e850e4c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png
index 0ee8c00..ad920ac 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt
index 7bb5994..5a04dd4 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-zoomed-expected.txt
@@ -1,30 +1,30 @@
-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 (9,9) size 782x572

-      RenderBlock {P} at (0,0) size 782x44

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

-          text run at (0,0) width 65: "Test for "

-        RenderInline {A} at (0,0) size 359x21 [color=#0000EE]

-          RenderText {#text} at (65,0) size 359x21

-            text run at (65,0) width 359: "https://bugs.webkit.org/show_bug.cgi?id=24733"

-        RenderText {#text} at (424,0) size 4x21

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

-        RenderBR {BR} at (428,16) size 0x0

-        RenderText {#text} at (0,22) size 362x21

-          text run at (0,22) width 362: "Tests event handling on search fields with zoom."

-      RenderBlock {P} at (0,63) size 782x29

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

-          RenderBlock {DIV} at (3,3) size 178x19

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

-            RenderBlock {DIV} at (164,5) size 11x11

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

-      RenderBlock {P} at (0,164) size 782x22

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

-          text run at (0,0) width 46: "PASS"

-layer at (41,78) size 137x19

-  RenderBlock {DIV} at (27,1) size 137x19

-    RenderText {#text} at (1,0) size 109x18

-      text run at (1,0) width 109: "Some other text"

-caret: position 15 of child 0 {#text} of child 1 {DIV} of child 0 {DIV} of child 1 {INPUT} of child 3 {P} of child 1 {BODY} of child 0 {HTML} of document

+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 (9,9) size 782x572
+      RenderBlock {P} at (0,0) size 782x44
+        RenderText {#text} at (0,0) size 65x21
+          text run at (0,0) width 65: "Test for "
+        RenderInline {A} at (0,0) size 359x21 [color=#0000EE]
+          RenderText {#text} at (65,0) size 359x21
+            text run at (65,0) width 359: "https://bugs.webkit.org/show_bug.cgi?id=24733"
+        RenderText {#text} at (424,0) size 4x21
+          text run at (424,0) width 4: ":"
+        RenderBR {BR} at (428,16) size 0x0
+        RenderText {#text} at (0,22) size 362x21
+          text run at (0,22) width 362: "Tests event handling on search fields with zoom."
+      RenderBlock {P} at (0,63) size 782x29
+        RenderTextControl {INPUT} at (2,2) size 184x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderBlock {DIV} at (3,2) size 178x20
+            RenderBlock {DIV} at (2,0) size 22x16
+            RenderBlock {DIV} at (164,5) size 11x11
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,164) size 782x22
+        RenderText {#text} at (0,0) size 46x21
+          text run at (0,0) width 46: "PASS"
+layer at (41,77) size 137x19
+  RenderBlock {DIV} at (27,1) size 137x19
+    RenderText {#text} at (1,0) size 109x18
+      text run at (1,0) width 109: "Some other text"
+caret: position 15 of child 0 {#text} of child 1 {DIV} of child 0 {DIV} of child 1 {INPUT} of child 3 {P} of child 1 {BODY} of child 0 {HTML} of document
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 2951d91..83e3101 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 @@
-2cbec86e07ec012579ef9e9c828aa73d
\ No newline at end of file
+926917552b32705a2049fceb0ba7647c
\ 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 0a791b1..15669e0 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 b57787e..4935318 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,34 @@ 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 81x6 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderBlock {DIV} at (3,3) size 75x0
+      RenderTextControl {INPUT} at (0,123) size 81x6 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,3) size 75x12
           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 (87,32) size 181x40 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderBlock {DIV} at (3,3) size 175x34
+      RenderText {#text} at (81,114) size 4x19
+        text run at (81,114) width 4: " "
+      RenderTextControl {INPUT} at (87,104) size 181x40 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderBlock {DIV} at (3,11) size 175x17
           RenderBlock {DIV} at (0,3) size 1x11
           RenderBlock {DIV} at (162,4) size 10x10
-      RenderText {#text} at (270,34) size 4x19
-        text run at (270,34) width 4: " "
+      RenderText {#text} at (270,114) size 4x19
+        text run at (270,114) width 4: " "
       RenderTextControl {INPUT} at (276,20) size 308x200 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderBlock {DIV} at (3,3) size 302x194
+        RenderBlock {DIV} at (3,83) size 302x33
           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 (99,43) size 161x34
-  RenderBlock {DIV} at (1,0) size 161x34
+layer at (12,140) size 66x6
+  RenderBlock {DIV} at (1,6) size 66x6
+    RenderText {#text} at (1,0) size 10x6
+      text run at (1,0) width 10: "mini"
+layer at (99,123) size 161x17
+  RenderBlock {DIV} at (1,0) size 161x17
     RenderText {#text} at (1,0) size 35x17
       text run at (1,0) width 35: "small"
-layer at (288,31) size 279x194
-  RenderBlock {DIV} at (1,0) size 279x194
+layer at (288,111) size 279x33
+  RenderBlock {DIV} at (1,0) size 279x33
     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/replaced/width100percent-searchfield-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/width100percent-searchfield-expected.checksum
index 920acbd..39e7b10 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 @@
-4e67db309c82f5c20f57ed4b3831aa5c
\ No newline at end of file
+59e29d414c8a7a3a9f4fd20cadac8d08
\ 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 7d0faf6..dd3044a 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 42c1383..becc83d 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
@@ -16,12 +16,12 @@ layer at (0,0) size 800x600
                   RenderBlock {DIV} at (139,4) size 9x9
             RenderTableCell {TD} at (161,1) size 8x28 [r=0 c=1 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (3,3) size 0x16
+                RenderBlock {DIV} at (3,3) size 0x36
                   RenderBlock {DIV} at (0,0) size 1x11
                   RenderBlock {DIV} at (0,27) size 9x9
             RenderTableCell {TD} at (170,1) size 8x28 [r=0 c=2 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (3,3) size 0x16
+                RenderBlock {DIV} at (3,3) size 0x36
                   RenderBlock {DIV} at (0,0) size 1x11
                   RenderBlock {DIV} at (0,27) size 9x9
             RenderTableCell {TD} at (179,4) size 604x22 [r=0 c=3 rs=1 cs=1]
@@ -40,12 +40,12 @@ layer at (0,0) size 800x600
                   RenderBlock {DIV} at (619,4) size 9x9
             RenderTableCell {TD} at (641,1) size 8x28 [r=0 c=1 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (3,3) size 0x16
+                RenderBlock {DIV} at (3,3) size 0x38
                   RenderBlock {DIV} at (2,0) size 18x13
                   RenderBlock {DIV} at (0,29) size 9x9
             RenderTableCell {TD} at (650,1) size 8x28 [r=0 c=2 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-                RenderBlock {DIV} at (3,3) size 0x16
+                RenderBlock {DIV} at (3,3) size 0x38
                   RenderBlock {DIV} at (2,0) size 18x13
                   RenderBlock {DIV} at (0,29) size 9x9
             RenderTableCell {TD} at (659,4) size 124x22 [r=0 c=3 rs=1 cs=1]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 915a513..6dcc708 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2758,10 +2758,3 @@ BUG14207 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug28341.html = FAIL
 
 // Newly added test http://trac.webkit.org/changeset/44816
 BUG14673 : LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization.html = FAIL
-
-// Tests to be rebaselined shortly.
-BUGMERGE : LayoutTests/fast/forms/search-vertical-alignment.html = FAIL
-BUGMERGE : LayoutTests/fast/forms/search-zoomed.html = FAIL
-BUGMERGE WIN MAC : LayoutTests/fast/forms/searchfield-heights.html = FAIL
-BUGMERGE WIN MAC : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
-BUGMERGE : LayoutTests/compositing/repaint/become-overlay-composited-layer.html = FAIL