Diff
Modified: trunk/LayoutTests/ChangeLog (197233 => 197234)
--- trunk/LayoutTests/ChangeLog 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/ChangeLog 2016-02-27 05:11:09 UTC (rev 197234)
@@ -1,3 +1,36 @@
+2016-02-26 Zalan Bujtas <[email protected]>
+
+ REGRESSION (188611): Search field Cancel button should not overlap search text on extensions page.
+ https://bugs.webkit.org/show_bug.cgi?id=154692
+ <rdar://problem/22840453>
+
+ Reviewed by Brent Fulgham.
+
+ Adjust the cancel button position using the actual size of the cancel button.
+
+ When the input box and the font height trigger different cancel button sizes, we need to readjust
+ the rectangle returned by cancelButtonRectForBounds.
+ This fixes both the mispositioned cancel button and the squared off icon when the input field is zoomed all the way in.
+
+ * fast/forms/search/search-padding-cancel-results-buttons-expected.txt:
+ * platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt:
+ * platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt:
+ * platform/mac/fast/css/text-overflow-input-expected.txt:
+ * platform/mac/fast/forms/box-shadow-override-expected.txt:
+ * platform/mac/fast/forms/control-restrict-line-height-expected.txt:
+ * platform/mac/fast/forms/input-appearance-height-expected.txt:
+ * platform/mac/fast/forms/placeholder-position-expected.txt:
+ * platform/mac/fast/forms/placeholder-pseudo-style-expected.txt:
+ * platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt:
+ * platform/mac/fast/forms/search-display-none-cancel-button-expected.txt:
+ * platform/mac/fast/forms/search-rtl-expected.txt:
+ * platform/mac/fast/forms/search-styled-expected.txt:
+ * platform/mac/fast/forms/search-vertical-alignment-expected.txt:
+ * platform/mac/fast/forms/search/search-size-with-decorations-expected.txt:
+ * platform/mac/fast/forms/searchfield-heights-expected.txt:
+ * platform/mac/fast/repaint/search-field-cancel-expected.txt:
+ * platform/mac/fast/replaced/width100percent-searchfield-expected.txt:
+
2016-02-26 Commit Queue <[email protected]>
Unreviewed, rolling out r197216.
Modified: trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt (197233 => 197234)
--- trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTextControl {INPUT} at (2,2) size 190x37 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (12,12) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 196x43 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (12,12) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
RenderText {#text} at (0,0) size 0x0
-layer at (44,22) size 130x13
+layer at (44,25) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 20x13
text run at (0,0) width 20: "test"
Modified: trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -8,11 +8,11 @@
text run at (0,0) width 757: "Assuming the port-specific theme draws focus rings, this test can be used to ensure that a focus ring is drawn around a"
text run at (0,18) width 78: "search field."
RenderBlock (anonymous) at (0,52) size 784x23
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (21,65) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
Modified: trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -16,12 +16,12 @@
text run at (0,0) width 629: "If the test passes, you will see a text entry field containing \"default text\" inside the grey div below."
RenderBlock {DIV} at (0,68) size 163x45 [bgcolor=#888888]
RenderTextControl {INPUT} at (11,9) size 133x19 [bgcolor=#00FF00] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 127x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 106x13
- RenderBlock {DIV} at (114,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 127x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 100x13
+ RenderBlock {DIV} at (108,0) size 19x19
RenderText {#text} at (0,0) size 0x0
-layer at (30,96) size 106x13
- RenderBlock {DIV} at (0,0) size 106x13
+layer at (30,96) size 100x13
+ RenderBlock {DIV} at (0,0) size 100x13
RenderText {#text} at (0,0) size 60x13
text run at (0,0) width 60: "default text"
Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -13,48 +13,48 @@
RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (140,20) size 5x18
text run at (140,20) width 5: " "
- RenderTextControl {INPUT} at (146,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (305,20) size 5x18
- text run at (305,20) width 5: " "
- RenderTextControl {INPUT} at (311,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (450,20) size 5x18
- text run at (450,20) width 5: " "
- RenderTextControl {INPUT} at (456,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (615,20) size 5x18
- text run at (615,20) width 5: " "
- RenderTextControl {INPUT} at (621,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (311,20) size 5x18
+ text run at (311,20) width 5: " "
+ RenderTextControl {INPUT} at (317,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (456,20) size 5x18
+ text run at (456,20) width 5: " "
+ RenderTextControl {INPUT} at (462,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (627,20) size 5x18
+ text run at (627,20) width 5: " "
+ RenderTextControl {INPUT} at (633,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,3) size 131x13
RenderBlock {DIV} at (0,0) size 131x13
- RenderBR {BR} at (759,20) size 1x18
+ RenderBR {BR} at (771,20) size 1x18
RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (140,43) size 5x18
text run at (140,43) width 5: " "
- RenderTextControl {INPUT} at (146,43) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (305,43) size 5x18
- text run at (305,43) width 5: " "
- RenderTextControl {INPUT} at (311,43) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (450,43) size 5x18
- text run at (450,43) width 5: " "
- RenderTextControl {INPUT} at (456,43) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (615,43) size 5x18
- text run at (615,43) width 5: " "
- RenderTextControl {INPUT} at (621,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (146,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (311,43) size 5x18
+ text run at (311,43) width 5: " "
+ RenderTextControl {INPUT} at (317,43) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (456,43) size 5x18
+ text run at (456,43) width 5: " "
+ RenderTextControl {INPUT} at (462,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (627,43) size 5x18
+ text run at (627,43) width 5: " "
+ RenderTextControl {INPUT} at (633,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,3) size 131x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 0x0
@@ -65,48 +65,48 @@
RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (140,20) size 5x18
text run at (140,20) width 5: " "
- RenderTextControl {INPUT} at (146,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (305,20) size 5x18
- text run at (305,20) width 5: " "
- RenderTextControl {INPUT} at (311,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (450,20) size 5x18
- text run at (450,20) width 5: " "
- RenderTextControl {INPUT} at (456,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (615,20) size 5x18
- text run at (615,20) width 5: " "
- RenderTextControl {INPUT} at (621,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (311,20) size 5x18
+ text run at (311,20) width 5: " "
+ RenderTextControl {INPUT} at (317,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (456,20) size 5x18
+ text run at (456,20) width 5: " "
+ RenderTextControl {INPUT} at (462,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (627,20) size 5x18
+ text run at (627,20) width 5: " "
+ RenderTextControl {INPUT} at (633,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,3) size 131x13
RenderBlock {DIV} at (0,0) size 131x13
- RenderBR {BR} at (759,20) size 1x18
+ RenderBR {BR} at (771,20) size 1x18
RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (140,43) size 5x18
text run at (140,43) width 5: " "
- RenderTextControl {INPUT} at (146,43) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (305,43) size 5x18
- text run at (305,43) width 5: " "
- RenderTextControl {INPUT} at (311,43) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (450,43) size 5x18
- text run at (450,43) width 5: " "
- RenderTextControl {INPUT} at (456,43) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (615,43) size 5x18
- text run at (615,43) width 5: " "
- RenderTextControl {INPUT} at (621,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (146,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (311,43) size 5x18
+ text run at (311,43) width 5: " "
+ RenderTextControl {INPUT} at (317,43) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (456,43) size 5x18
+ text run at (456,43) width 5: " "
+ RenderTextControl {INPUT} at (462,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (627,43) size 5x18
+ text run at (627,43) width 5: " "
+ RenderTextControl {INPUT} at (633,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,3) size 131x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 0x0
@@ -144,15 +144,15 @@
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
layer at (165,73) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (323,73) size 130x13 scrollWidth 292
+layer at (329,73) size 130x13 scrollWidth 292
RenderBlock {DIV} at (3,3) size 131x13
RenderText {#text} at (0,0) size 291x13
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (475,73) size 130x13 scrollWidth 292
+layer at (481,73) size 130x13 scrollWidth 292
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 291x13
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (632,73) size 130x13 scrollWidth 362
+layer at (644,73) size 130x13 scrollWidth 362
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 361x13
text run at (0,0) width 361: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
@@ -168,15 +168,15 @@
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
layer at (165,96) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (323,96) size 130x13 scrollX 160 scrollWidth 291
+layer at (329,96) size 130x13 scrollX 160 scrollWidth 291
RenderBlock {DIV} at (3,3) size 131x13
RenderText {#text} at (-160,0) size 292x13
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (475,96) size 130x13 scrollX 160 scrollWidth 291
+layer at (481,96) size 130x13 scrollX 160 scrollWidth 291
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (-160,0) size 292x13
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (632,96) size 130x13 scrollX 230 scrollWidth 361
+layer at (644,96) size 130x13 scrollX 230 scrollWidth 361
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (-230,0) size 362x13
text run at (-230,0) width 361 RTL: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
@@ -192,15 +192,15 @@
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
layer at (165,153) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (323,153) size 130x13 scrollWidth 292
+layer at (329,153) size 130x13 scrollWidth 292
RenderBlock {DIV} at (3,3) size 131x13
RenderText {#text} at (0,0) size 291x13
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (475,153) size 130x13 scrollWidth 292
+layer at (481,153) size 130x13 scrollWidth 292
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 291x13
text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (632,153) size 130x13 scrollWidth 362
+layer at (644,153) size 130x13 scrollWidth 362
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 361x13
text run at (0,0) width 361: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
@@ -216,15 +216,15 @@
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
layer at (165,176) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (323,176) size 130x13 scrollX 160 scrollWidth 291
+layer at (329,176) size 130x13 scrollX 160 scrollWidth 291
RenderBlock {DIV} at (3,3) size 131x13
RenderText {#text} at (-160,0) size 292x13
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (475,176) size 130x13 scrollX 160 scrollWidth 291
+layer at (481,176) size 130x13 scrollX 160 scrollWidth 291
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (-160,0) size 292x13
text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
-layer at (632,176) size 130x13 scrollX 230 scrollWidth 361
+layer at (644,176) size 130x13 scrollX 230 scrollWidth 361
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (-230,0) size 362x13
text run at (-230,0) width 361 RTL: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
Modified: trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -10,25 +10,25 @@
RenderText {#text} at (0,0) size 259x18
text run at (0,0) width 259: "You should not see any red on this page."
RenderBlock {DIV} at (0,68) size 784x23
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,91) size 784x23
- RenderTextControl {INPUT} at (2,2) size 167x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 161x13
- RenderBlock {DIV} at (0,1) size 17x11
- RenderBlock {DIV} at (17,0) size 131x13
- RenderBlock {DIV} at (147,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x19
+ RenderBlock {DIV} at (0,4) size 17x11
+ RenderBlock {DIV} at (17,3) size 131x13
+ RenderBlock {DIV} at (147,0) size 20x19
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,114) size 784x23
- RenderTextControl {INPUT} at (2,2) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,137) size 784x32
RenderBlock {INPUT} at (2,13) size 12x12
Modified: trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -20,11 +20,11 @@
RenderText {#text} at (291,41) size 5x18
text run at (291,41) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,64) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (2,64) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (21,75) size 130x13 scrollWidth 272
RenderBlock {DIV} at (0,0) size 131x13
Modified: trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -90,11 +90,11 @@
RenderBR {BR} at (208,228) size 1x0
RenderText {#text} at (0,237) size 45x18
text run at (0,237) width 45: "search "
- RenderTextControl {INPUT} at (46,237) size 159x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (46,237) size 165x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (50,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13
Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -3,26 +3,26 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderBR {BR} at (161,16) size 1x0
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderBR {BR} at (167,16) size 1x0
RenderTextControl {INPUT} at (2,25) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (140,39) size 1x0
- RenderTextControl {INPUT} at (2,48) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderBR {BR} at (161,62) size 1x0
- RenderTextControl {INPUT} at (2,71) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
- RenderBR {BR} at (175,85) size 1x0
+ RenderTextControl {INPUT} at (2,48) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderBR {BR} at (167,62) size 1x0
+ RenderTextControl {INPUT} at (2,71) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
+ RenderBR {BR} at (181,85) size 1x0
RenderBR {BR} at (156,128) size 0x0
RenderTextControl {INPUT} at (2,130) size 137x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderBR {BR} at (140,144) size 1x0
Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -9,24 +9,24 @@
RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (140,20) size 5x18
text run at (140,20) width 5: " "
- RenderTextControl {INPUT} at (146,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (305,20) size 5x18
- text run at (305,20) width 5: " "
- RenderTextControl {INPUT} at (311,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (311,20) size 5x18
+ text run at (311,20) width 5: " "
+ RenderTextControl {INPUT} at (317,20) size 138x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderFlexibleBox {DIV} at (3,3) size 131x13
RenderBlock {DIV} at (0,0) size 131x13
- RenderText {#text} at (450,20) size 5x18
- text run at (450,20) width 5: " "
- RenderTextControl {INPUT} at (456,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (594,20) size 5x18
- text run at (594,20) width 5: " "
- RenderTextControl {INPUT} at (600,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (738,20) size 5x18
- text run at (738,20) width 5: " "
+ RenderText {#text} at (456,20) size 5x18
+ text run at (456,20) width 5: " "
+ RenderTextControl {INPUT} at (462,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (600,20) size 5x18
+ text run at (600,20) width 5: " "
+ RenderTextControl {INPUT} at (606,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (744,20) size 5x18
+ text run at (744,20) width 5: " "
RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
layer at (13,31) size 130x13
@@ -41,23 +41,23 @@
text run at (0,0) width 36: "search"
layer at (165,31) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (323,31) size 130x13
+layer at (329,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13 [color=#640000]
RenderText {#text} at (0,0) size 52x13
text run at (0,0) width 52: "password"
-layer at (323,31) size 130x13
+layer at (329,31) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (467,31) size 130x13
+layer at (473,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13 [color=#640000]
RenderText {#text} at (0,0) size 69x13
text run at (0,0) width 69: "disabled text"
-layer at (467,31) size 130x13
+layer at (473,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13 [color=#545454]
-layer at (611,31) size 130x13
+layer at (617,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13 [color=#A9A9A9]
RenderText {#text} at (0,0) size 37x13
text run at (0,0) width 37: "default"
-layer at (611,31) size 130x13
+layer at (617,31) size 130x13
RenderBlock {DIV} at (3,3) size 131x13
layer at (13,54) size 130x13
RenderBlock {DIV} at (3,3) size 131x13 [color=#A9A9A9]
Modified: trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -3,59 +3,59 @@
layer at (0,0) size 800x177
RenderBlock {HTML} at (0,0) size 800x177
RenderBody {BODY} at (8,8) size 784x161
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (161,2) size 5x18
- text run at (161,2) width 5: " "
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (167,2) size 5x18
+ text run at (167,2) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,25) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (161,25) size 5x18
- text run at (161,25) width 5: " "
+ RenderTextControl {INPUT} at (2,25) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (167,25) size 5x18
+ text run at (167,25) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,48) size 167x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 161x13
- RenderBlock {DIV} at (0,1) size 17x11
- RenderBlock {DIV} at (17,0) size 131x13
- RenderBlock {DIV} at (147,1) size 14x11
- RenderText {#text} at (170,48) size 5x18
- text run at (170,48) width 5: " "
+ RenderTextControl {INPUT} at (2,48) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x19
+ RenderBlock {DIV} at (0,4) size 17x11
+ RenderBlock {DIV} at (17,3) size 131x13
+ RenderBlock {DIV} at (147,0) size 20x19
+ RenderText {#text} at (176,48) size 5x18
+ text run at (176,48) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,71) size 167x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 161x13
- RenderBlock {DIV} at (0,1) size 17x11
- RenderBlock {DIV} at (17,0) size 131x13
- RenderBlock {DIV} at (147,1) size 14x11
- RenderText {#text} at (170,71) size 5x18
- text run at (170,71) width 5: " "
+ RenderTextControl {INPUT} at (2,71) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x19
+ RenderBlock {DIV} at (0,4) size 17x11
+ RenderBlock {DIV} at (17,3) size 131x13
+ RenderBlock {DIV} at (147,0) size 20x19
+ RenderText {#text} at (176,71) size 5x18
+ text run at (176,71) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,94) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
- RenderText {#text} at (175,94) size 5x18
- text run at (175,94) width 5: " "
+ RenderTextControl {INPUT} at (2,94) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
+ RenderText {#text} at (181,94) size 5x18
+ text run at (181,94) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,117) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
- RenderText {#text} at (175,117) size 5x18
- text run at (175,117) width 5: " "
+ RenderTextControl {INPUT} at (2,117) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
+ RenderText {#text} at (181,117) size 5x18
+ text run at (181,117) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,140) size 302x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 296x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 261x13
- RenderBlock {DIV} at (282,1) size 14x11
+ RenderTextControl {INPUT} at (2,140) size 308x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 302x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 261x13
+ RenderBlock {DIV} at (282,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (21,13) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
Modified: trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -7,22 +7,22 @@
RenderText {#text} at (0,0) size 391x18
text run at (0,0) width 391: "Only the second search field should have a cancel button (\x{D7})."
RenderBlock (anonymous) at (0,34) size 784x23
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (161,2) size 5x18
- text run at (161,2) width 5: " "
- RenderTextControl {INPUT} at (167,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (167,2) size 5x18
+ text run at (167,2) width 5: " "
+ RenderTextControl {INPUT} at (173,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (21,47) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
-layer at (186,47) size 130x13
+layer at (192,47) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "this one"
Modified: trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -6,12 +6,12 @@
RenderText {#text} at (0,0) size 510x18
text run at (0,0) width 510: "This tests that the display:none style will work on a search field's cancel button."
RenderBR {BR} at (509,14) size 1x0
- RenderTextControl {INPUT} at (2,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
+ RenderTextControl {INPUT} at (2,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,3) size 158x13
RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 144x13
+ RenderBlock {DIV} at (8,0) size 150x13
RenderText {#text} at (0,0) size 0x0
-layer at (21,31) size 143x13
- RenderBlock {DIV} at (0,0) size 144x13
+layer at (21,31) size 149x13
+ RenderBlock {DIV} at (0,0) size 150x13
RenderText {#text} at (0,0) size 20x13
text run at (0,0) width 20: "test"
Modified: trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -16,27 +16,27 @@
RenderText {#text} at (754,0) size 5x18
text run at (754,0) width 5: "."
RenderBlock {P} at (0,34) size 784x69
- RenderTextControl {INPUT} at (2,2) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
- RenderText {#text} at (175,2) size 5x18
- text run at (175,2) width 5: " "
+ RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
+ RenderText {#text} at (181,2) size 5x18
+ text run at (181,2) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,25) size 237x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 231x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 196x13
- RenderBlock {DIV} at (217,1) size 14x11
- RenderText {#text} at (240,25) size 5x18
- text run at (240,25) width 5: " "
+ RenderTextControl {INPUT} at (2,25) size 243x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 237x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 196x13
+ RenderBlock {DIV} at (217,0) size 20x19
+ RenderText {#text} at (246,25) size 5x18
+ text run at (246,25) width 5: " "
RenderBR {BR} at (0,0) size 0x0
- RenderTextControl {INPUT} at (2,48) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
+ RenderTextControl {INPUT} at (2,48) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,119) size 784x18
RenderText {#text} at (0,0) size 37x18
Modified: trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -3,11 +3,11 @@
layer at (0,0) size 800x39
RenderBlock {HTML} at (0,0) size 800x39
RenderBody {BODY} at (8,8) size 784x23
- RenderTextControl {INPUT} at (2,2) size 172x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 166x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 131x13
- RenderBlock {DIV} at (152,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 172x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 131x13
+ RenderBlock {DIV} at (152,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (35,13) size 130x13
RenderBlock {DIV} at (25,3) size 131x13 [color=#A9A9A9]
Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -11,48 +11,48 @@
text run at (104,18) width 366: "a text field, the vertical position of the text should be the "
text run at (469,18) width 125: "same in both fields."
RenderBlock {P} at (0,52) size 784x45
- RenderTextControl {INPUT} at (2,0) size 167x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 161x39
+ RenderTextControl {INPUT} at (2,0) size 173x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,3) size 167x39
RenderBlock {DIV} at (0,14) size 17x11
RenderBlock {DIV} at (17,13) size 131x13
- RenderBlock {DIV} at (147,14) size 14x11
- RenderText {#text} at (170,13) size 5x18
- text run at (170,13) width 5: " "
- RenderTextControl {INPUT} at (176,0) size 137x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBlock {DIV} at (147,10) size 20x19
+ RenderText {#text} at (176,13) size 5x18
+ text run at (176,13) width 5: " "
+ RenderTextControl {INPUT} at (182,0) size 137x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,113) size 784x18
- RenderTextControl {INPUT} at (2,2) size 167x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,1) size 161x13
- RenderBlock {DIV} at (0,1) size 17x11
- RenderBlock {DIV} at (17,0) size 131x13
- RenderBlock {DIV} at (147,1) size 14x11
- RenderText {#text} at (170,0) size 5x18
- text run at (170,0) width 5: " "
- RenderTextControl {INPUT} at (176,2) size 137x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderTextControl {INPUT} at (2,2) size 173x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x16
+ RenderBlock {DIV} at (0,2) size 17x12
+ RenderBlock {DIV} at (17,1) size 131x14
+ RenderBlock {DIV} at (147,0) size 20x19
+ RenderText {#text} at (176,0) size 5x18
+ text run at (176,0) width 5: " "
+ RenderTextControl {INPUT} at (182,2) size 137x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,147) size 784x18
- RenderTextControl {INPUT} at (2,5) size 167x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,0) size 161x12
+ RenderTextControl {INPUT} at (2,5) size 173x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x12
RenderBlock {DIV} at (0,0) size 17x12
RenderBlock {DIV} at (17,3) size 131x6
- RenderBlock {DIV} at (147,0) size 14x12
- RenderText {#text} at (170,0) size 5x18
- text run at (170,0) width 5: " "
- RenderTextControl {INPUT} at (176,5) size 137x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderBlock {DIV} at (147,0) size 20x19
+ RenderText {#text} at (176,0) size 5x18
+ text run at (176,0) width 5: " "
+ RenderTextControl {INPUT} at (182,5) size 137x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
layer at (30,76) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
-layer at (187,76) size 130x13
+layer at (193,76) size 130x13
RenderBlock {DIV} at (3,16) size 131x13
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
-layer at (30,124) size 130x13
+layer at (30,125) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
-layer at (187,124) size 130x13
+layer at (193,124) size 130x13
RenderBlock {DIV} at (3,1) size 131x13
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
@@ -60,7 +60,7 @@
RenderBlock {DIV} at (0,0) size 131x6
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
-layer at (187,163) size 130x6 scrollHeight 13
+layer at (193,163) size 130x6 scrollHeight 13
RenderBlock {DIV} at (3,3) size 131x6
RenderText {#text} at (0,0) size 22x13
text run at (0,0) width 22: "Text"
Modified: trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -6,35 +6,35 @@
RenderText {#text} at (0,0) size 376x18
text run at (0,0) width 376: "This tests that aqua-style search fields do not honor height."
RenderBR {BR} at (375,14) size 1x0
- RenderTextControl {INPUT} at (0,22) size 137x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 131x11
- RenderBlock {DIV} at (0,1) size 8x9
- RenderBlock {DIV} at (8,0) size 110x11
- RenderBlock {DIV} at (117,1) size 14x9
- RenderText {#text} at (136,20) size 5x18
- text run at (136,20) width 5: " "
- RenderTextControl {INPUT} at (142,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
- RenderText {#text} at (301,20) size 5x18
- text run at (301,20) width 5: " "
- RenderTextControl {INPUT} at (307,18) size 185x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 179x16
- RenderBlock {DIV} at (0,1) size 10x14
- RenderBlock {DIV} at (10,0) size 153x16
- RenderBlock {DIV} at (162,1) size 17x14
+ RenderTextControl {INPUT} at (0,22) size 139x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,1) size 133x15
+ RenderBlock {DIV} at (0,3) size 8x9
+ RenderBlock {DIV} at (8,2) size 110x11
+ RenderBlock {DIV} at (117,0) size 16x15
+ RenderText {#text} at (138,20) size 5x18
+ text run at (138,20) width 5: " "
+ RenderTextControl {INPUT} at (144,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
+ RenderText {#text} at (309,20) size 5x18
+ text run at (309,20) width 5: " "
+ RenderTextControl {INPUT} at (315,18) size 191x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 185x22
+ RenderBlock {DIV} at (0,4) size 10x14
+ RenderBlock {DIV} at (10,3) size 153x16
+ RenderBlock {DIV} at (162,0) size 23x22
RenderText {#text} at (0,0) size 0x0
layer at (19,33) size 109x11
RenderBlock {DIV} at (0,0) size 110x11
RenderText {#text} at (0,0) size 19x11
text run at (0,0) width 19: "mini"
-layer at (161,31) size 130x13
+layer at (163,31) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
RenderText {#text} at (0,0) size 28x13
text run at (0,0) width 28: "small"
-layer at (328,29) size 152x16
+layer at (336,29) size 152x16
RenderBlock {DIV} at (0,0) size 153x16
RenderText {#text} at (0,0) size 43x16
text run at (0,0) width 43: "regular"
Modified: trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -12,11 +12,11 @@
RenderText {#text} at (362,0) size 328x18
text run at (362,0) width 328: ". The cancel button in a search field fails to redraw."
RenderBlock (anonymous) at (0,34) size 784x23
- RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 131x13
- RenderBlock {DIV} at (138,1) size 14x11
+ RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 131x13
+ RenderBlock {DIV} at (138,0) size 20x19
RenderText {#text} at (0,0) size 0x0
layer at (21,47) size 130x13
RenderBlock {DIV} at (0,0) size 131x13
Modified: trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt (197233 => 197234)
--- trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-02-27 05:11:09 UTC (rev 197234)
@@ -11,22 +11,22 @@
RenderTableRow {TR} at (0,1) size 784x25
RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 0x13
- RenderBlock {DIV} at (8,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 0x13
+ RenderBlock {DIV} at (8,0) size 19x19
RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 0x13
- RenderBlock {DIV} at (8,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 0x13
+ RenderBlock {DIV} at (8,0) size 19x19
RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 0x13
- RenderBlock {DIV} at (8,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 8x11
+ RenderBlock {DIV} at (8,3) size 0x13
+ RenderBlock {DIV} at (8,0) size 19x19
RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 4x19
text run at (1,2) width 4: " "
@@ -38,22 +38,22 @@
RenderTableRow {TR} at (0,1) size 784x25
RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 0x13
- RenderBlock {DIV} at (22,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 0x13
+ RenderBlock {DIV} at (22,0) size 19x19
RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 0x13
- RenderBlock {DIV} at (22,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 0x13
+ RenderBlock {DIV} at (22,0) size 19x19
RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 0x13
- RenderBlock {DIV} at (0,1) size 22x11
- RenderBlock {DIV} at (22,0) size 0x13
- RenderBlock {DIV} at (22,1) size 13x11
+ RenderFlexibleBox {DIV} at (3,0) size 0x19
+ RenderBlock {DIV} at (0,4) size 22x11
+ RenderBlock {DIV} at (22,3) size 0x13
+ RenderBlock {DIV} at (22,0) size 19x19
RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 4x19
text run at (1,2) width 4: " "
Modified: trunk/Source/WebCore/ChangeLog (197233 => 197234)
--- trunk/Source/WebCore/ChangeLog 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/Source/WebCore/ChangeLog 2016-02-27 05:11:09 UTC (rev 197234)
@@ -1,3 +1,23 @@
+2016-02-26 Zalan Bujtas <[email protected]>
+
+ REGRESSION (188611): Search field Cancel button should not overlap search text on extensions page.
+ https://bugs.webkit.org/show_bug.cgi?id=154692
+ <rdar://problem/22840453>
+
+ Reviewed by Brent Fulgham.
+
+ Adjust the cancel button position using the actual size of the cancel button.
+
+ When the input box and the font height trigger different cancel button sizes, we need to readjust
+ the rectangle returned by cancelButtonRectForBounds.
+ This fixes both the mispositioned cancel button and the squared off icon when the input field is zoomed all the way in.
+
+ Covered by existing tests.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::cancelButtonSizes): Update button size.
+
2016-02-26 Brady Eidson <[email protected]>
Modern IDB: New database versions are never committed to SQLite.
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (197233 => 197234)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-27 04:54:36 UTC (rev 197233)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-27 05:11:09 UTC (rev 197234)
@@ -1659,6 +1659,19 @@
bool RenderThemeMac::paintSearchFieldCancelButton(const RenderBox& box, const PaintInfo& paintInfo, const IntRect& r)
{
+ auto adjustedCancelButtonRect = [this, &box] (const FloatRect& localBoundsForCancelButton) -> FloatRect
+ {
+ IntSize cancelButtonSizeBasedOnFontSize = sizeForSystemFont(box.style(), cancelButtonSizes());
+ FloatSize diff = localBoundsForCancelButton.size() - FloatSize(cancelButtonSizeBasedOnFontSize);
+ if (!diff.width() && !diff.height())
+ return localBoundsForCancelButton;
+ // Vertically centered and right aligned.
+ FloatRect adjustedLocalBoundsForCancelButton = localBoundsForCancelButton;
+ adjustedLocalBoundsForCancelButton.move(diff.width(), floorToDevicePixel(diff.height() / 2, box.document().deviceScaleFactor()));
+ adjustedLocalBoundsForCancelButton.setSize(cancelButtonSizeBasedOnFontSize);
+ return adjustedLocalBoundsForCancelButton;
+ };
+
if (!box.element())
return false;
Element* input = box.element()->shadowHost();
@@ -1683,7 +1696,7 @@
float zoomLevel = box.style().effectiveZoom();
- FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))];
+ FloatRect localBounds = adjustedCancelButtonRect([search cancelButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))]);
FloatPoint paintingPos = convertToPaintingPosition(inputBox, box, localBounds.location(), r.location());
FloatRect unzoomedRect(paintingPos, localBounds.size());
@@ -1694,7 +1707,6 @@
paintInfo.context().scale(FloatSize(zoomLevel, zoomLevel));
paintInfo.context().translate(-unzoomedRect.x(), -unzoomedRect.y());
}
-
[[search cancelButtonCell] drawWithFrame:unzoomedRect inView:documentViewFor(box)];
[[search cancelButtonCell] setControlView:nil];
return false;
@@ -1702,7 +1714,7 @@
const IntSize* RenderThemeMac::cancelButtonSizes() const
{
- static const IntSize sizes[3] = { IntSize(16, 13), IntSize(13, 11), IntSize(13, 9) };
+ static const IntSize sizes[3] = { IntSize(22, 22), IntSize(19, 19), IntSize(15, 15) };
return sizes;
}
