Rebaseline second set of tests marked as flaky due to GPU issue

Bug: 736177
Change-Id: I9342daddcfb032a366c2178f2c78e54dda0757a6
Reviewed-on: https://chromium-review.googlesource.com/801231Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521374}

third_party/WebKit/LayoutTests/TestExpectations

@@ -3052,15 +3052,7 @@ crbug.com/785931 virtual/gpu/fast/canvas/canvas-composite-video.html [ NeedsManu
 
 # crbug.com/736177: Failures likely related to different results on Mac with different GPUs
 crbug.com/736177 [ Mac10.12 ] fast/forms/form-element-geometry.html [ Failure Pass ]
-# These tests are failing on both Mac-10.12 when using an Intel GPU and Mac-10.11.6 when using no GPU
-crbug.com/736177 [ Mac ] fast/forms/control-restrict-line-height.html [ Failure Pass ]
 crbug.com/736177 [ Mac ] fast/forms/input-appearance-height.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/placeholder-position.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/search/search-appearance-basic.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/search/search-cancel-button-style-sharing.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/search/search-display-none-cancel-button.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/search/search-rtl.html [ Failure Pass ]
-crbug.com/736177 [ Mac ] fast/forms/search/searchfield-heights.html [ Failure Pass ]
 # These tests are failing on Mac-10.12 when using an Intel GPU and Mac Retina
 crbug.com/736177 [ Mac10.12 Retina ] compositing/overflow/theme-affects-visual-overflow.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 Retina ] css1/box_properties/acid_test.html [ Failure Pass ]

third_party/WebKit/LayoutTests/platform/mac-mac10.11/fast/forms/search/search-rtl-expected.txt

+layer at (0,0) size 800x600
+  LayoutView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  LayoutBlockFlow {HTML} at (0,0) size 800x600
+    LayoutBlockFlow {BODY} at (8,8) size 784x576
+      LayoutBlockFlow {P} at (0,0) size 784x18
+        LayoutText {#text} at (0,0) size 54x18
+          text run at (0,0) width 54: "Test for "
+        LayoutInline {I} at (0,0) size 702x18
+          LayoutInline {A} at (0,0) size 304x18 [color=#0000EE]
+            LayoutText {#text} at (53,0) size 304x18
+              text run at (53,0) width 304: "http://bugs.webkit.org/show_bug.cgi?id=11916"
+          LayoutText {#text} at (356,0) size 399x18
+            text run at (356,0) width 5: " "
+            text run at (360,0) width 395: "REGRESSION (SearchField): RTL search fields are mixed up"
+        LayoutText {#text} at (754,0) size 5x18
+          text run at (754,0) width 5: "."
+      LayoutBlockFlow {P} at (0,34) size 784x57
+        LayoutTextControl {INPUT} at (0,0) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+          LayoutFlexibleBox {DIV} at (4,3) size 125x13
+            LayoutBlockFlow {DIV} at (12,0) size 113x13
+        LayoutText {#text} at (133,0) size 4x18
+          text run at (133,0) width 4: " "
+        LayoutBR {BR} at (0,0) size 0x0
+        LayoutTextControl {INPUT} at (0,19) size 193x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+          LayoutFlexibleBox {DIV} at (4,3) size 185x13
+            LayoutBlockFlow {DIV} at (12,0) size 173x13
+        LayoutText {#text} at (193,19) size 4x18
+          text run at (193,19) width 4: " "
+        LayoutBR {BR} at (0,0) size 0x0
+        LayoutTextControl {INPUT} at (0,38) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+          LayoutFlexibleBox {DIV} at (4,3) size 125x13
+            LayoutBlockFlow {DIV} at (12,0) size 113x13
+        LayoutText {#text} at (0,0) size 0x0
+      LayoutBlockFlow {P} at (0,107) size 784x18
+        LayoutText {#text} at (0,0) size 37x18
+          text run at (0,0) width 37: "PASS"
+layer at (24,45) size 113x13 scrollX 1.00 scrollWidth 115
+  LayoutBlockFlow {DIV} at (0,0) size 113x13
+    LayoutText {#text} at (-1,0) size 115x13
+      text run at (-1,0) width 21 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
+      text run at (19,0) width 9: "B"
+      text run at (27,0) width 43 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
+      text run at (69,0) width 8: "A"
+      text run at (76,0) width 37 RTL: "\x{5D4}\x{5D5}\x{5D0} \x{5D6}\x{5D4} "
+layer at (24,64) size 173x13
+  LayoutBlockFlow {DIV} at (0,0) size 173x13
+    LayoutText {#text} at (58,0) size 115x13
+      text run at (58,0) width 22 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
+      text run at (79,0) width 9: "B"
+      text run at (87,0) width 43 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
+      text run at (129,0) width 8: "A"
+      text run at (136,0) width 37 RTL: "\x{5D4}\x{5D5}\x{5D0} \x{5D6}\x{5D4} "
+layer at (24,83) size 113x13
+  LayoutBlockFlow {DIV} at (0,0) size 113x13
+layer at (12,46) size 11x11 transparent
+  LayoutBlockFlow {DIV} at (0,1) size 11x11
+layer at (12,65) size 11x11 transparent
+  LayoutBlockFlow {DIV} at (0,1) size 11x11
+layer at (12,84) size 11x11 transparent
+  LayoutBlockFlow {DIV} at (0,1) size 11x11
+caret: position 0 of child 0 {DIV} of child 0 {DIV} of child 0 {DIV} of {#document-fragment} of child 9 {INPUT} of child 3 {P} of body

third_party/WebKit/LayoutTests/platform/mac-mac10.11/fast/forms/search/searchfield-heights-expected.txt

+layer at (0,0) size 800x600
+  LayoutView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  LayoutBlockFlow {HTML} at (0,0) size 800x600
+    LayoutBlockFlow {BODY} at (8,8) size 784x584
+      LayoutText {#text} at (0,0) size 376x18
+        text run at (0,0) width 376: "This tests that aqua-style search fields do not honor height."
+      LayoutBR {BR} at (375,14) size 1x0
+      LayoutTextControl {INPUT} at (0,23) size 110x15 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+        LayoutFlexibleBox {DIV} at (3,2) size 104x11
+          LayoutBlockFlow {DIV} at (0,0) size 94x11
+      LayoutText {#text} at (110,20) size 4x18
+        text run at (110,20) width 4: " "
+      LayoutTextControl {INPUT} at (114,20) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+        LayoutFlexibleBox {DIV} at (4,3) size 125x13
+          LayoutBlockFlow {DIV} at (0,0) size 113x13
+      LayoutText {#text} at (247,20) size 4x18
+        text run at (247,20) width 4: " "
+      LayoutTextControl {INPUT} at (251,18) size 156x22 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
+        LayoutFlexibleBox {DIV} at (5,3) size 146x16
+          LayoutBlockFlow {DIV} at (0,0) size 131x16
+      LayoutText {#text} at (0,0) size 0x0
+layer at (11,33) size 94x11
+  LayoutBlockFlow {DIV} at (0,0) size 94x11
+    LayoutText {#text} at (0,0) size 18x11
+      text run at (0,0) width 18: "mini"
+layer at (126,31) size 113x13
+  LayoutBlockFlow {DIV} at (0,0) size 113x13
+    LayoutText {#text} at (0,0) size 27x13
+      text run at (0,0) width 27: "small"
+layer at (264,29) size 131x16
+  LayoutBlockFlow {DIV} at (0,0) size 131x16
+    LayoutText {#text} at (0,0) size 44x16
+      text run at (0,0) width 44: "regular"
+layer at (106,34) size 9x9 transparent
+  LayoutBlockFlow {DIV} at (95,1) size 9x9
+layer at (240,32) size 11x11 transparent
+  LayoutBlockFlow {DIV} at (114,1) size 11x11
+layer at (396,30) size 14x14 transparent
+  LayoutBlockFlow {DIV} at (132,1) size 14x14

third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/control-restrict-line-height-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutText {#text} at (0,0) size 533x18
-        text run at (0,0) width 533: "This tests that we don't honor line-height for controls that have restricted font size. "
-      LayoutBR {BR} at (0,0) size 0x0
-      LayoutMenuList {SELECT} at (0,19) size 299x18 [bgcolor=#F8F8F8]
-        LayoutBlockFlow (anonymous) at (0,0) size 299x18
-          LayoutText (anonymous) at (8,2) size 268x13
-            text run at (8,2) width 268: "This text should be centered vertically in the button"
-      LayoutText {#text} at (299,18) size 4x18
-        text run at (299,18) width 4: " "
-      LayoutBR {BR} at (0,0) size 0x0
-      LayoutButton {INPUT} at (0,38) size 283.41x18 [bgcolor=#FFFFFF]
-        LayoutBlockFlow (anonymous) at (8,2) size 267.41x13
-          LayoutText {#text} at (0,0) size 268x13
-            text run at (0,0) width 268: "This text should be centered vertically in the button"
-      LayoutText {#text} at (283,37) size 5x18
-        text run at (283,37) width 5: " "
-      LayoutBR {BR} at (0,0) size 0x0
-      LayoutTextControl {INPUT} at (0,56) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutFlexibleBox {DIV} at (4,3) size 125x13
-          LayoutBlockFlow {DIV} at (0,0) size 113x13
-      LayoutText {#text} at (0,0) size 0x0
-layer at (12,67) size 113x13 scrollWidth 268
-  LayoutBlockFlow {DIV} at (0,0) size 113x13
-    LayoutText {#text} at (0,0) size 268x13
-      text run at (0,0) width 268: "This text should be centered vertically in the button"
-layer at (126,68) size 11x11 transparent
-  LayoutBlockFlow {DIV} at (114,1) size 11x11

third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-appearance-height-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x576
-      LayoutBlockFlow (anonymous) at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 781x18
-          text run at (0,0) width 781: "This tests the height attribute of form elements. The only element that should honour this value is the Image type of input."
-      LayoutBlockFlow {FORM} at (0,18) size 784x229
-        LayoutText {#text} at (0,0) size 37x18
-          text run at (0,0) width 37: "input "
-        LayoutTextControl {INPUT} at (36.89,0) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutText {#text} at (167,0) size 5x18
-          text run at (167,0) width 5: " "
-        LayoutBR {BR} at (171,14) size 1x0
-        LayoutText {#text} at (0,19) size 28x18
-          text run at (0,19) width 28: "text "
-        LayoutTextControl {INPUT} at (27.98,19) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutText {#text} at (158,19) size 5x18
-          text run at (158,19) width 5: " "
-        LayoutBR {BR} at (162,33) size 1x0
-        LayoutText {#text} at (0,38) size 66x18
-          text run at (0,38) width 66: "checkbox "
-        LayoutBlockFlow {INPUT} at (68.19,42) size 12x12
-        LayoutText {#text} at (83,38) size 5x18
-          text run at (83,38) width 5: " "
-        LayoutBR {BR} at (87,52) size 1x0
-        LayoutText {#text} at (0,57) size 25x18
-          text run at (0,57) width 25: "file "
-        LayoutFileUploadControl {INPUT} at (24.44,58) size 236x18 "No file chosen"
-          LayoutButton {INPUT} at (0,0) size 76.61x18 [bgcolor=#FFFFFF]
-            LayoutBlockFlow (anonymous) at (8,2) size 60.61x13
-              LayoutText {#text} at (0,0) size 61x13
-                text run at (0,0) width 61: "Choose File"
-        LayoutText {#text} at (260,57) size 5x18
-          text run at (260,57) width 5: " "
-        LayoutBR {BR} at (264,71) size 1x0
-        LayoutText {#text} at (0,76) size 44x18
-          text run at (0,76) width 44: "image "
-        LayoutImage {INPUT} at (43.09,89) size 10x1
-        LayoutText {#text} at (53,76) size 5x18
-          text run at (53,76) width 5: " "
-        LayoutBR {BR} at (57,90) size 1x0
-        LayoutText {#text} at (0,94) size 37x18
-          text run at (0,94) width 37: "radio "
-        LayoutBlockFlow {INPUT} at (39.77,97) size 12x13
-        LayoutText {#text} at (54,94) size 5x18
-          text run at (54,94) width 5: " "
-        LayoutBR {BR} at (58,108) size 1x0
-        LayoutText {#text} at (0,116) size 40x18
-          text run at (0,116) width 40: "range "
-        LayoutSlider {INPUT} at (41.53,115) size 129x15 [color=#909090] [bgcolor=#FFFFFF]
-          LayoutFlexibleBox {DIV} at (0,0) size 129x15
-            LayoutBlockFlow {DIV} at (0,0) size 129x15
-              LayoutBlockFlow {DIV} at (57,0) size 15x15
-        LayoutText {#text} at (172,116) size 5x18
-          text run at (172,116) width 5: " "
-        LayoutBR {BR} at (176,130) size 1x0
-        LayoutText {#text} at (0,134) size 35x18
-          text run at (0,134) width 35: "reset "
-        LayoutButton {INPUT} at (34.20,135) size 45.36x18 [bgcolor=#FFFFFF]
-          LayoutBlockFlow (anonymous) at (8,2) size 29.36x13
-            LayoutText {#text} at (0,0) size 30x13
-              text run at (0,0) width 30: "Reset"
-        LayoutText {#text} at (79,134) size 5x18
-          text run at (79,134) width 5: " "
-        LayoutBR {BR} at (83,148) size 1x0
-        LayoutText {#text} at (0,153) size 48x18
-          text run at (0,153) width 48: "submit "
-        LayoutButton {INPUT} at (47.56,154) size 52.47x18 [bgcolor=#FFFFFF]
-          LayoutBlockFlow (anonymous) at (8,2) size 36.47x13
-            LayoutText {#text} at (0,0) size 37x13
-              text run at (0,0) width 37: "Submit"
-        LayoutText {#text} at (100,153) size 5x18
-          text run at (100,153) width 5: " "
-        LayoutBR {BR} at (104,167) size 1x0
-        LayoutText {#text} at (0,172) size 51x18
-          text run at (0,172) width 51: "isindex "
-        LayoutTextControl {INPUT} at (50.22,172) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutText {#text} at (181,172) size 5x18
-          text run at (181,172) width 5: " "
-        LayoutBR {BR} at (185,186) size 1x0
-        LayoutText {#text} at (0,191) size 65x18
-          text run at (0,191) width 65: "password "
-        LayoutTextControl {INPUT} at (64.44,191) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutText {#text} at (195,191) size 5x18
-          text run at (195,191) width 5: " "
-        LayoutBR {BR} at (199,205) size 1x0
-        LayoutText {#text} at (0,210) size 45x18
-          text run at (0,210) width 45: "search "
-        LayoutTextControl {INPUT} at (44.86,210) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-          LayoutFlexibleBox {DIV} at (4,3) size 125x13
-            LayoutBlockFlow {DIV} at (0,0) size 113x13
-        LayoutText {#text} at (0,0) size 0x0
-layer at (48,29) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (39,48) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (61,201) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (75,220) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (57,239) size 113x13
-  LayoutBlockFlow {DIV} at (0,0) size 113x13
-layer at (171,240) size 11x11 transparent
-  LayoutBlockFlow {DIV} at (114,1) size 11x11

third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/placeholder-position-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutTextControl {INPUT} at (0,0) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutFlexibleBox {DIV} at (4,3) size 125x13
-          LayoutBlockFlow {DIV} at (0,0) size 113x13
-      LayoutText {#text} at (133,0) size 4x18
-        text run at (133,0) width 4: " "
-      LayoutBR {BR} at (137,14) size 0x0
-      LayoutTextControl {INPUT} at (0,19) size 71x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (71,19) size 4x18
-        text run at (71,19) width 4: " "
-      LayoutTextControl {INPUT} at (75,19) size 71x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (146,19) size 4x18
-        text run at (146,19) width 4: " "
-      LayoutTextControl {INPUT} at (150,19) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (281,19) size 4x18
-        text run at (281,19) width 4: " "
-      LayoutBR {BR} at (285,33) size 0x0
-      LayoutTextControl {INPUT} at (0,38) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutFlexibleBox {DIV} at (4,3) size 125x13
-          LayoutBlockFlow {DIV} at (12,0) size 113x13
-      LayoutBR {BR} at (133,52) size 0x0
-      LayoutTextControl {INPUT} at (0,57) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutFlexibleBox {DIV} at (4,3) size 125x13
-          LayoutBlockFlow {DIV} at (0,0) size 113x13
-      LayoutBR {BR} at (133,71) size 0x0
-      LayoutBR {BR} at (141,108) size 0x0
-      LayoutTextControl {INPUT} at (0,108) size 131x33 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutBR {BR} at (131,122) size 0x0
-      LayoutBR {BR} at (141,186) size 0x0
-      LayoutTextControl {INPUT} at (5,191) size 179x30 [bgcolor=#FFFFFF] [border: (5px solid #000000)]
-      LayoutBR {BR} at (189,212) size 0x0
-      LayoutTextControl {INPUT} at (0,226) size 131x31 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (131,232) size 4x18
-        text run at (131,232) width 4: " "
-      LayoutTextControl {INPUT} at (135,226) size 131x31 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (266,232) size 4x18
-        text run at (266,232) width 4: " "
-      LayoutTextControl {INPUT} at (270,229) size 131x25 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (401,232) size 4x18
-        text run at (401,232) width 4: " "
-      LayoutTextControl {INPUT} at (405,229) size 131x25 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (536,232) size 4x18
-        text run at (536,232) width 4: " "
-      LayoutTextControl {INPUT} at (540,229) size 131x25 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (671,232) size 4x18
-        text run at (671,232) width 4: " "
-      LayoutBR {BR} at (0,0) size 0x0
-      LayoutTextControl {INPUT} at (0,257) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (131,257) size 4x18
-        text run at (131,257) width 4: " "
-      LayoutTextControl {INPUT} at (135,257) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (266,257) size 4x18
-        text run at (266,257) width 4: " "
-      LayoutTextControl {INPUT} at (270,257) size 131x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-      LayoutText {#text} at (401,257) size 4x18
-        text run at (401,257) width 4: " "
-      LayoutBR {BR} at (405,271) size 0x0
-      LayoutBR {BR} at (131,304) size 0x0
-layer at (12,11) size 113x13
-  LayoutBlockFlow {DIV} at (4,3) size 113x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (12,11) size 113x13
-  LayoutBlockFlow {DIV} at (0,0) size 113x13
-layer at (11,30) size 65x13
-  LayoutBlockFlow {DIV} at (3,3) size 65x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (11,30) size 65x13
-  LayoutBlockFlow {DIV} at (3,3) size 65x13
-layer at (86,30) size 65x13
-  LayoutBlockFlow {DIV} at (3,3) size 65x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (86,30) size 65x13
-  LayoutBlockFlow {DIV} at (3,3) size 65x13
-layer at (161,30) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 95x13
-      text run at (0,0) width 95: "\x{65E5}\x{672C}\x{8A9E}placeholder"
-layer at (161,30) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (24,49) size 113x13
-  LayoutBlockFlow {DIV} at (16,3) size 113x13 [color=#757575]
-    LayoutText {#text} at (52,0) size 61x13
-      text run at (52,0) width 61: "placeholder"
-layer at (24,49) size 113x13
-  LayoutBlockFlow {DIV} at (0,0) size 113x13
-layer at (12,68) size 113x13
-  LayoutBlockFlow {DIV} at (4,3) size 113x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (12,68) size 113x13
-  LayoutBlockFlow {DIV} at (0,0) size 113x13
-layer at (8,84) size 141x32 clip at (9,85) size 139x30
-  LayoutTextControl {TEXTAREA} at (0,76) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    LayoutBlockFlow {DIV} at (3,3) size 135x13 [color=#757575]
-      LayoutText {#text} at (0,0) size 62x13
-        text run at (0,0) width 62: "placeholder"
-    LayoutBlockFlow {DIV} at (3,3) size 135x13
-layer at (11,119) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (11,119) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (8,149) size 141x45 clip at (9,150) size 139x43
-  LayoutTextControl {TEXTAREA} at (0,141) size 141x45 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    LayoutBlockFlow {DIV} at (3,16) size 135x13 [color=#757575]
-      LayoutText {#text} at (0,0) size 62x13
-        text run at (0,0) width 62: "placeholder"
-    LayoutBlockFlow {DIV} at (3,16) size 135x13
-layer at (19,205) size 167x18
-  LayoutBlockFlow {DIV} at (6,6) size 167x18 [color=#757575]
-    LayoutText {#text} at (0,0) size 84x18
-      text run at (0,0) width 84: "placeholder"
-layer at (19,205) size 167x18
-  LayoutBlockFlow {DIV} at (6,6) size 167x18
-layer at (11,237) size 125x25
-  LayoutBlockFlow {DIV} at (3,3) size 125x25
-    LayoutText {#text} at (0,6) size 29x13
-      text run at (0,6) width 29: "Value"
-layer at (146,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,9) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (146,237) size 125x25
-  LayoutBlockFlow {DIV} at (3,3) size 125x25
-layer at (281,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,6) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (281,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,6) size 125x13
-layer at (416,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,6) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (416,237) size 125x25
-  LayoutBlockFlow {DIV} at (3,0) size 125x25
-layer at (551,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,6) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (551,243) size 125x13
-  LayoutBlockFlow {DIV} at (3,6) size 125x13
-layer at (11,268) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-    LayoutText {#text} at (48,0) size 29x13
-      text run at (48,0) width 29: "Value"
-layer at (146,268) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (31,0) size 62x13
-      text run at (31,0) width 62: "placeholder"
-layer at (146,268) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (281,268) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (31,0) size 62x13
-      text run at (31,0) width 62: "placeholder"
-layer at (281,268) size 125x13
-  LayoutBlockFlow {DIV} at (3,3) size 125x13
-layer at (126,12) size 11x11 transparent
-  LayoutBlockFlow {DIV} at (114,1) size 11x11
-layer at (12,50) size 11x11 transparent
-  LayoutBlockFlow {DIV} at (0,1) size 11x11
-layer at (126,69) size 11x11 transparent
-  LayoutBlockFlow {DIV} at (114,1) size 11x11
-layer at (8,284) size 131x33 clip at (10,286) size 127x29
-  LayoutTextControl {INPUT} at (0,276) size 131x33 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-layer at (11,301) size 125x13 backgroundClip at (27,301) size 109x13 clip at (27,301) size 109x13
-  LayoutBlockFlow {DIV} at (3,17) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 62x13
-      text run at (0,0) width 62: "placeholder"
-layer at (11,301) size 125x13 backgroundClip at (27,301) size 109x13 clip at (27,301) size 109x13
-  LayoutBlockFlow {DIV} at (3,17) size 125x13

third_party/WebKit/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt

@@ -6,27 +6,27 @@ layer at (0,0) size 800x600
       LayoutText {#text} at (0,0) size 533x18
         text run at (0,0) width 533: "This tests that we don't honor line-height for controls that have restricted font size. "
       LayoutBR {BR} at (0,0) size 0x0
-      LayoutMenuList {SELECT} at (0,19) size 299x18 [bgcolor=#F8F8F8]
-        LayoutBlockFlow (anonymous) at (0,0) size 299x18
-          LayoutText (anonymous) at (8,2) size 268x13
-            text run at (8,2) width 268: "This text should be centered vertically in the button"
-      LayoutText {#text} at (299,18) size 4x18
-        text run at (299,18) width 4: " "
+      LayoutMenuList {SELECT} at (0,19) size 302x18 [bgcolor=#F8F8F8]
+        LayoutBlockFlow (anonymous) at (0,0) size 302x18
+          LayoutText (anonymous) at (8,2) size 271x13
+            text run at (8,2) width 271: "This text should be centered vertically in the button"
+      LayoutText {#text} at (302,18) size 4x18
+        text run at (302,18) width 4: " "
       LayoutBR {BR} at (0,0) size 0x0
-      LayoutButton {INPUT} at (0,38) size 283.92x18 [bgcolor=#FFFFFF]
-        LayoutBlockFlow (anonymous) at (8,2) size 267.92x13
-          LayoutText {#text} at (0,0) size 268x13
-            text run at (0,0) width 268: "This text should be centered vertically in the button"
-      LayoutText {#text} at (283,37) size 5x18
-        text run at (283,37) width 5: " "
+      LayoutButton {INPUT} at (0,38) size 286.83x18 [bgcolor=#FFFFFF]
+        LayoutBlockFlow (anonymous) at (8,2) size 270.83x13
+          LayoutText {#text} at (0,0) size 271x13
+            text run at (0,0) width 271: "This text should be centered vertically in the button"
+      LayoutText {#text} at (286,37) size 5x18
+        text run at (286,37) width 5: " "
       LayoutBR {BR} at (0,0) size 0x0
       LayoutTextControl {INPUT} at (0,56) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
         LayoutFlexibleBox {DIV} at (4,3) size 125x13
           LayoutBlockFlow {DIV} at (0,0) size 113x13
       LayoutText {#text} at (0,0) size 0x0
-layer at (12,67) size 113x13 scrollWidth 269
+layer at (12,67) size 113x13 scrollWidth 272
   LayoutBlockFlow {DIV} at (0,0) size 113x13
-    LayoutText {#text} at (0,0) size 268x13
-      text run at (0,0) width 268: "This text should be centered vertically in the button"
+    LayoutText {#text} at (0,0) size 271x13
+      text run at (0,0) width 271: "This text should be centered vertically in the button"
 layer at (126,68) size 11x11 transparent
   LayoutBlockFlow {DIV} at (114,1) size 11x11

third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt

@@ -27,14 +27,14 @@ layer at (0,0) size 800x600
         LayoutBR {BR} at (87,52) size 1x0
         LayoutText {#text} at (0,57) size 25x18
           text run at (0,57) width 25: "file "
-        LayoutFileUploadControl {INPUT} at (24.44,58) size 236x18 "No file chosen"
-          LayoutButton {INPUT} at (0,0) size 76.61x18 [bgcolor=#FFFFFF]
-            LayoutBlockFlow (anonymous) at (8,2) size 60.61x13
-              LayoutText {#text} at (0,0) size 61x13
-                text run at (0,0) width 61: "Choose File"
-        LayoutText {#text} at (260,57) size 5x18
-          text run at (260,57) width 5: " "
-        LayoutBR {BR} at (264,71) size 1x0
+        LayoutFileUploadControl {INPUT} at (24.44,58) size 238x18 "No file chosen"
+          LayoutButton {INPUT} at (0,0) size 77.33x18 [bgcolor=#FFFFFF]
+            LayoutBlockFlow (anonymous) at (8,2) size 61.33x13
+              LayoutText {#text} at (0,0) size 62x13
+                text run at (0,0) width 62: "Choose File"
+        LayoutText {#text} at (262,57) size 5x18
+          text run at (262,57) width 5: " "
+        LayoutBR {BR} at (266,71) size 1x0
         LayoutText {#text} at (0,76) size 44x18
           text run at (0,76) width 44: "image "
         LayoutImage {INPUT} at (43.09,89) size 10x1
@@ -58,8 +58,8 @@ layer at (0,0) size 800x600
         LayoutBR {BR} at (176,130) size 1x0
         LayoutText {#text} at (0,134) size 35x18
           text run at (0,134) width 35: "reset "
-        LayoutButton {INPUT} at (34.20,135) size 45.52x18 [bgcolor=#FFFFFF]
-          LayoutBlockFlow (anonymous) at (8,2) size 29.52x13
+        LayoutButton {INPUT} at (34.20,135) size 45.67x18 [bgcolor=#FFFFFF]
+          LayoutBlockFlow (anonymous) at (8,2) size 29.67x13
             LayoutText {#text} at (0,0) size 30x13
               text run at (0,0) width 30: "Reset"
         LayoutText {#text} at (79,134) size 5x18
@@ -67,8 +67,8 @@ layer at (0,0) size 800x600
         LayoutBR {BR} at (83,148) size 1x0
         LayoutText {#text} at (0,153) size 48x18
           text run at (0,153) width 48: "submit "
-        LayoutButton {INPUT} at (47.56,154) size 52.47x18 [bgcolor=#FFFFFF]
-          LayoutBlockFlow (anonymous) at (8,2) size 36.47x13
+        LayoutButton {INPUT} at (47.56,154) size 52.86x18 [bgcolor=#FFFFFF]
+          LayoutBlockFlow (anonymous) at (8,2) size 36.86x13
             LayoutText {#text} at (0,0) size 37x13
               text run at (0,0) width 37: "Submit"
         LayoutText {#text} at (100,153) size 5x18

third_party/WebKit/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt

@@ -80,8 +80,8 @@ layer at (86,30) size 65x13
   LayoutBlockFlow {DIV} at (3,3) size 65x13
 layer at (161,30) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (0,0) size 95x13
-      text run at (0,0) width 95: "\x{65E5}\x{672C}\x{8A9E}placeholder"
+    LayoutText {#text} at (0,0) size 96x13
+      text run at (0,0) width 96: "\x{65E5}\x{672C}\x{8A9E}placeholder"
 layer at (161,30) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13
 layer at (24,49) size 113x13
@@ -116,8 +116,8 @@ layer at (8,149) size 141x45 clip at (9,150) size 139x43
     LayoutBlockFlow {DIV} at (3,16) size 135x13
 layer at (19,205) size 167x18
   LayoutBlockFlow {DIV} at (6,6) size 167x18 [color=#757575]
-    LayoutText {#text} at (0,0) size 84x18
-      text run at (0,0) width 84: "placeholder"
+    LayoutText {#text} at (0,0) size 81x18
+      text run at (0,0) width 81: "placeholder"
 layer at (19,205) size 167x18
   LayoutBlockFlow {DIV} at (6,6) size 167x18
 layer at (11,237) size 125x25
@@ -154,14 +154,14 @@ layer at (11,268) size 125x13
       text run at (48,0) width 29: "Value"
 layer at (146,268) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (31,0) size 62x13
-      text run at (31,0) width 62: "placeholder"
+    LayoutText {#text} at (31,0) size 63x13
+      text run at (31,0) width 63: "placeholder"
 layer at (146,268) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13
 layer at (281,268) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13 [color=#757575]
-    LayoutText {#text} at (31,0) size 62x13
-      text run at (31,0) width 62: "placeholder"
+    LayoutText {#text} at (31,0) size 63x13
+      text run at (31,0) width 63: "placeholder"
 layer at (281,268) size 125x13
   LayoutBlockFlow {DIV} at (3,3) size 125x13
 layer at (126,12) size 11x11 transparent

third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-appearance-basic-expected.txt

@@ -134,32 +134,32 @@ layer at (15,170) size 113x13
       text run at (0,0) width 17: "foo"
 layer at (17,197) size 131x16
   LayoutBlockFlow {DIV} at (0,0) size 131x16
-    LayoutText {#text} at (0,0) size 21x16
-      text run at (0,0) width 21: "foo"
+    LayoutText {#text} at (0,0) size 20x16
+      text run at (0,0) width 20: "foo"
 layer at (185,197) size 131x16
   LayoutBlockFlow {DIV} at (0,0) size 131x16
-    LayoutText {#text} at (0,0) size 21x16
-      text run at (0,0) width 21: "foo"
+    LayoutText {#text} at (0,0) size 20x16
+      text run at (0,0) width 20: "foo"
 layer at (353,197) size 131x16
   LayoutBlockFlow {DIV} at (0,0) size 131x16
-    LayoutText {#text} at (0,0) size 21x16
-      text run at (0,0) width 21: "foo"
+    LayoutText {#text} at (0,0) size 20x16
+      text run at (0,0) width 20: "foo"
 layer at (19,239) size 170x19 backgroundClip at (19,239) size 169x19 clip at (19,239) size 169x19
   LayoutBlockFlow {DIV} at (0,0) size 169.50x19
-    LayoutText {#text} at (0,0) size 26x19
-      text run at (0,0) width 26: "foo"
+    LayoutText {#text} at (0,0) size 25x19
+      text run at (0,0) width 25: "foo"
 layer at (234,234) size 206x26
   LayoutBlockFlow {DIV} at (0,0) size 206x26
-    LayoutText {#text} at (0,0) size 31x26
-      text run at (0,0) width 31: "foo"
+    LayoutText {#text} at (0,0) size 32x26
+      text run at (0,0) width 32: "foo"
 layer at (19,293) size 170x19 backgroundClip at (19,293) size 169x19 clip at (19,293) size 169x19
   LayoutBlockFlow {DIV} at (0,0) size 169.50x19
-    LayoutText {#text} at (0,0) size 26x19
-      text run at (0,0) width 26: "foo"
+    LayoutText {#text} at (0,0) size 25x19
+      text run at (0,0) width 25: "foo"
 layer at (234,288) size 206x26
   LayoutBlockFlow {DIV} at (0,0) size 206x26
-    LayoutText {#text} at (0,0) size 31x26
-      text run at (0,0) width 31: "foo"
+    LayoutText {#text} at (0,0) size 32x26
+      text run at (0,0) width 32: "foo"
 layer at (30,336) size 132x13
   LayoutBlockFlow {DIV} at (18,4) size 132x13 [color=#757575]
     LayoutText {#text} at (0,0) size 92x13

third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-rtl-expected.txt

@@ -35,20 +35,20 @@ layer at (0,0) size 800x600
       LayoutBlockFlow {P} at (0,107) size 784x18
         LayoutText {#text} at (0,0) size 37x18
           text run at (0,0) width 37: "PASS"
-layer at (24,45) size 113x13 scrollX 1.00 scrollWidth 115
+layer at (24,45) size 113x13 scrollX 2.00 scrollWidth 115
   LayoutBlockFlow {DIV} at (0,0) size 113x13
-    LayoutText {#text} at (-1,0) size 115x13
-      text run at (-1,0) width 21 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
-      text run at (19,0) width 9: "B"
-      text run at (27,0) width 43 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
+    LayoutText {#text} at (-2,0) size 116x13
+      text run at (-2,0) width 22 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
+      text run at (19,0) width 8: "B"
+      text run at (26,0) width 44 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
       text run at (69,0) width 8: "A"
       text run at (76,0) width 37 RTL: "\x{5D4}\x{5D5}\x{5D0} \x{5D6}\x{5D4} "
 layer at (24,64) size 173x13
   LayoutBlockFlow {DIV} at (0,0) size 173x13
-    LayoutText {#text} at (58,0) size 115x13
-      text run at (58,0) width 22 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
-      text run at (79,0) width 9: "B"
-      text run at (87,0) width 43 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
+    LayoutText {#text} at (57,0) size 116x13
+      text run at (57,0) width 23 RTL: " \x{5D5}\x{5D6}\x{5D4}\x{5D5}"
+      text run at (79,0) width 8: "B"
+      text run at (86,0) width 44 RTL: " \x{5D5}\x{5D4}\x{5D9}\x{5D0} \x{5D6}\x{5D4} "
       text run at (129,0) width 8: "A"
       text run at (136,0) width 37 RTL: "\x{5D4}\x{5D5}\x{5D0} \x{5D6}\x{5D4} "
 layer at (24,83) size 113x13

third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/searchfield-heights-expected.txt

@@ -22,16 +22,16 @@ layer at (0,0) size 800x600
       LayoutText {#text} at (0,0) size 0x0
 layer at (11,33) size 94x11
   LayoutBlockFlow {DIV} at (0,0) size 94x11
-    LayoutText {#text} at (0,0) size 18x11
-      text run at (0,0) width 18: "mini"
+    LayoutText {#text} at (0,0) size 19x11
+      text run at (0,0) width 19: "mini"
 layer at (126,31) size 113x13
   LayoutBlockFlow {DIV} at (0,0) size 113x13
-    LayoutText {#text} at (0,0) size 27x13
-      text run at (0,0) width 27: "small"
+    LayoutText {#text} at (0,0) size 28x13
+      text run at (0,0) width 28: "small"
 layer at (264,29) size 131x16
   LayoutBlockFlow {DIV} at (0,0) size 131x16
-    LayoutText {#text} at (0,0) size 44x16
-      text run at (0,0) width 44: "regular"
+    LayoutText {#text} at (0,0) size 43x16
+      text run at (0,0) width 43: "regular"
 layer at (106,34) size 9x9 transparent
   LayoutBlockFlow {DIV} at (95,1) size 9x9
 layer at (240,32) size 11x11 transparent