<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197167] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197167">197167</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-02-26 09:00:50 -0800 (Fri, 26 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/WebCore:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::cancelButtonSizes): Update button size.
LayoutTests:
* 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformssearchsearchpaddingcancelresultsbuttonsexpectedtxt">trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcssfocusringexistsforsearchfieldexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextinputwithwebkitborderradiusexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsstextoverflowinputexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsboxshadowoverrideexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformscontrolrestrictlineheightexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsinputappearanceheightexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformsplaceholderpseudostyleexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchsearchsizewithdecorationsexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchcancelbuttonstylesharingexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchdisplaynonecancelbuttonexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchrtlexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchstyledexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastformssearchfieldheightsexpectedtxt">trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintsearchfieldcancelexpectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastreplacedwidth100percentsearchfieldexpectedtxt">trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/ChangeLog 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-02-26 Zalan Bujtas <zalan@apple.com>
+
+ 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.
+
+ * 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:
+
</ins><span class="cx"> 2016-02-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement ::slotted pseudo element
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssearchsearchpaddingcancelresultsbuttonsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -3,13 +3,13 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (44,22) size 130x13
</del><ins>+layer at (44,25) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 20x13
</span><span class="cx"> text run at (0,0) width 20: "test"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssfocusringexistsforsearchfieldexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> 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"
</span><span class="cx"> text run at (0,18) width 78: "search field."
</span><span class="cx"> RenderBlock (anonymous) at (0,52) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,65) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextinputwithwebkitborderradiusexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -16,12 +16,12 @@
</span><span class="cx"> 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."
</span><span class="cx"> RenderBlock {DIV} at (0,68) size 163x45 [bgcolor=#888888]
</span><span class="cx"> RenderTextControl {INPUT} at (11,9) size 133x19 [bgcolor=#00FF00] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (30,96) size 106x13
- RenderBlock {DIV} at (0,0) size 106x13
</del><ins>+layer at (30,96) size 100x13
+ RenderBlock {DIV} at (0,0) size 100x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 60x13
</span><span class="cx"> text run at (0,0) width 60: "default text"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowinputexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -13,48 +13,48 @@
</span><span class="cx"> RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (140,20) size 5x18
</span><span class="cx"> text run at (140,20) width 5: " "
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>- RenderBR {BR} at (759,20) size 1x18
</del><ins>+ RenderBR {BR} at (771,20) size 1x18
</ins><span class="cx"> RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (140,43) size 5x18
</span><span class="cx"> text run at (140,43) width 5: " "
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="lines">@@ -65,48 +65,48 @@
</span><span class="cx"> RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (140,20) size 5x18
</span><span class="cx"> text run at (140,20) width 5: " "
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>- RenderBR {BR} at (759,20) size 1x18
</del><ins>+ RenderBR {BR} at (771,20) size 1x18
</ins><span class="cx"> RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (140,43) size 5x18
</span><span class="cx"> text run at (140,43) width 5: " "
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="lines">@@ -144,15 +144,15 @@
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><span class="cx"> layer at (165,73) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (323,73) size 130x13 scrollWidth 292
</del><ins>+layer at (329,73) size 130x13 scrollWidth 292
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 291x13
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (475,73) size 130x13 scrollWidth 292
</del><ins>+layer at (481,73) size 130x13 scrollWidth 292
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 291x13
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (632,73) size 130x13 scrollWidth 362
</del><ins>+layer at (644,73) size 130x13 scrollWidth 362
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 361x13
</span><span class="cx"> 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}"
</span><span class="lines">@@ -168,15 +168,15 @@
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><span class="cx"> layer at (165,96) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (323,96) size 130x13 scrollX 160 scrollWidth 291
</del><ins>+layer at (329,96) size 130x13 scrollX 160 scrollWidth 291
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderText {#text} at (-160,0) size 292x13
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (475,96) size 130x13 scrollX 160 scrollWidth 291
</del><ins>+layer at (481,96) size 130x13 scrollX 160 scrollWidth 291
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (-160,0) size 292x13
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (632,96) size 130x13 scrollX 230 scrollWidth 361
</del><ins>+layer at (644,96) size 130x13 scrollX 230 scrollWidth 361
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (-230,0) size 362x13
</span><span class="cx"> 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}"
</span><span class="lines">@@ -192,15 +192,15 @@
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><span class="cx"> layer at (165,153) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (323,153) size 130x13 scrollWidth 292
</del><ins>+layer at (329,153) size 130x13 scrollWidth 292
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 291x13
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (475,153) size 130x13 scrollWidth 292
</del><ins>+layer at (481,153) size 130x13 scrollWidth 292
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 291x13
</span><span class="cx"> text run at (0,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (632,153) size 130x13 scrollWidth 362
</del><ins>+layer at (644,153) size 130x13 scrollWidth 362
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 361x13
</span><span class="cx"> 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}"
</span><span class="lines">@@ -216,15 +216,15 @@
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><span class="cx"> layer at (165,176) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (323,176) size 130x13 scrollX 160 scrollWidth 291
</del><ins>+layer at (329,176) size 130x13 scrollX 160 scrollWidth 291
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderText {#text} at (-160,0) size 292x13
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (475,176) size 130x13 scrollX 160 scrollWidth 291
</del><ins>+layer at (481,176) size 130x13 scrollX 160 scrollWidth 291
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (-160,0) size 292x13
</span><span class="cx"> text run at (-160,0) width 291: "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
</span><del>-layer at (632,176) size 130x13 scrollX 230 scrollWidth 361
</del><ins>+layer at (644,176) size 130x13 scrollX 230 scrollWidth 361
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (-230,0) size 362x13
</span><span class="cx"> 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}"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsboxshadowoverrideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -10,25 +10,25 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 259x18
</span><span class="cx"> text run at (0,0) width 259: "You should not see any red on this page."
</span><span class="cx"> RenderBlock {DIV} at (0,68) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {DIV} at (0,91) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {DIV} at (0,114) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock (anonymous) at (0,137) size 784x32
</span><span class="cx"> RenderBlock {INPUT} at (2,13) size 12x12
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformscontrolrestrictlineheightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -20,11 +20,11 @@
</span><span class="cx"> RenderText {#text} at (291,41) size 5x18
</span><span class="cx"> text run at (291,41) width 5: " "
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,75) size 130x13 scrollWidth 272
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsinputappearanceheightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -90,11 +90,11 @@
</span><span class="cx"> RenderBR {BR} at (208,228) size 1x0
</span><span class="cx"> RenderText {#text} at (0,237) size 45x18
</span><span class="cx"> text run at (0,237) width 45: "search "
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (50,31) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -3,26 +3,26 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTextControl {INPUT} at (2,25) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderBR {BR} at (140,39) size 1x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderBR {BR} at (156,128) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,130) size 137x33 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderBR {BR} at (140,144) size 1x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsplaceholderpseudostyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -9,24 +9,24 @@
</span><span class="cx"> RenderTextControl {INPUT} at (2,20) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (140,20) size 5x18
</span><span class="cx"> text run at (140,20) width 5: " "
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderTextControl {INPUT} at (2,43) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (13,31) size 130x13
</span><span class="lines">@@ -41,23 +41,23 @@
</span><span class="cx"> text run at (0,0) width 36: "search"
</span><span class="cx"> layer at (165,31) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (323,31) size 130x13
</del><ins>+layer at (329,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13 [color=#640000]
</span><span class="cx"> RenderText {#text} at (0,0) size 52x13
</span><span class="cx"> text run at (0,0) width 52: "password"
</span><del>-layer at (323,31) size 130x13
</del><ins>+layer at (329,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (467,31) size 130x13
</del><ins>+layer at (473,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13 [color=#640000]
</span><span class="cx"> RenderText {#text} at (0,0) size 69x13
</span><span class="cx"> text run at (0,0) width 69: "disabled text"
</span><del>-layer at (467,31) size 130x13
</del><ins>+layer at (473,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13 [color=#545454]
</span><del>-layer at (611,31) size 130x13
</del><ins>+layer at (617,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13 [color=#A9A9A9]
</span><span class="cx"> RenderText {#text} at (0,0) size 37x13
</span><span class="cx"> text run at (0,0) width 37: "default"
</span><del>-layer at (611,31) size 130x13
</del><ins>+layer at (617,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13
</span><span class="cx"> layer at (13,54) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (3,3) size 131x13 [color=#A9A9A9]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchsearchsizewithdecorationsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -3,59 +3,59 @@
</span><span class="cx"> layer at (0,0) size 800x177
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x177
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x161
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,13) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchcancelbuttonstylesharingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -7,22 +7,22 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 391x18
</span><span class="cx"> text run at (0,0) width 391: "Only the second search field should have a cancel button (\x{D7})."
</span><span class="cx"> RenderBlock (anonymous) at (0,34) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,47) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><del>-layer at (186,47) size 130x13
</del><ins>+layer at (192,47) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 42x13
</span><span class="cx"> text run at (0,0) width 42: "this one"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchdisplaynonecancelbuttonexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -6,12 +6,12 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 510x18
</span><span class="cx"> text run at (0,0) width 510: "This tests that the display:none style will work on a search field's cancel button."
</span><span class="cx"> RenderBR {BR} at (509,14) size 1x0
</span><del>- RenderTextControl {INPUT} at (2,20) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 152x13
</del><ins>+ RenderTextControl {INPUT} at (2,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,3) size 158x13
</ins><span class="cx"> RenderBlock {DIV} at (0,1) size 8x11
</span><del>- RenderBlock {DIV} at (8,0) size 144x13
</del><ins>+ RenderBlock {DIV} at (8,0) size 150x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>-layer at (21,31) size 143x13
- RenderBlock {DIV} at (0,0) size 144x13
</del><ins>+layer at (21,31) size 149x13
+ RenderBlock {DIV} at (0,0) size 150x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 20x13
</span><span class="cx"> text run at (0,0) width 20: "test"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchrtlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -16,27 +16,27 @@
</span><span class="cx"> RenderText {#text} at (754,0) size 5x18
</span><span class="cx"> text run at (754,0) width 5: "."
</span><span class="cx"> RenderBlock {P} at (0,34) size 784x69
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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: " "
</del><ins>+ 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: " "
</ins><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,119) size 784x18
</span><span class="cx"> RenderText {#text} at (0,0) size 37x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchstyledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -3,11 +3,11 @@
</span><span class="cx"> layer at (0,0) size 800x39
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x39
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (35,13) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (25,3) size 131x13 [color=#A9A9A9]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -11,48 +11,48 @@
</span><span class="cx"> text run at (104,18) width 366: "a text field, the vertical position of the text should be the "
</span><span class="cx"> text run at (469,18) width 125: "same in both fields."
</span><span class="cx"> RenderBlock {P} at (0,52) size 784x45
</span><del>- RenderTextControl {INPUT} at (2,0) size 167x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 161x39
</del><ins>+ RenderTextControl {INPUT} at (2,0) size 173x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,3) size 167x39
</ins><span class="cx"> RenderBlock {DIV} at (0,14) size 17x11
</span><span class="cx"> RenderBlock {DIV} at (17,13) size 131x13
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,113) size 784x18
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,147) size 784x18
</span><del>- RenderTextControl {INPUT} at (2,5) size 167x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,0) size 161x12
</del><ins>+ RenderTextControl {INPUT} at (2,5) size 173x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,0) size 167x12
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 17x12
</span><span class="cx"> RenderBlock {DIV} at (17,3) size 131x6
</span><del>- 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)]
</del><ins>+ 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)]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (30,76) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span><del>-layer at (187,76) size 130x13
</del><ins>+layer at (193,76) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,16) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span><del>-layer at (30,124) size 130x13
</del><ins>+layer at (30,125) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span><del>-layer at (187,124) size 130x13
</del><ins>+layer at (193,124) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (3,1) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x6
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span><del>-layer at (187,163) size 130x6 scrollHeight 13
</del><ins>+layer at (193,163) size 130x6 scrollHeight 13
</ins><span class="cx"> RenderBlock {DIV} at (3,3) size 131x6
</span><span class="cx"> RenderText {#text} at (0,0) size 22x13
</span><span class="cx"> text run at (0,0) width 22: "Text"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchfieldheightsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -6,35 +6,35 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 376x18
</span><span class="cx"> text run at (0,0) width 376: "This tests that aqua-style search fields do not honor height."
</span><span class="cx"> RenderBR {BR} at (375,14) size 1x0
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (19,33) size 109x11
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 110x11
</span><span class="cx"> RenderText {#text} at (0,0) size 19x11
</span><span class="cx"> text run at (0,0) width 19: "mini"
</span><del>-layer at (161,31) size 130x13
</del><ins>+layer at (163,31) size 130x13
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span><span class="cx"> RenderText {#text} at (0,0) size 28x13
</span><span class="cx"> text run at (0,0) width 28: "small"
</span><del>-layer at (328,29) size 152x16
</del><ins>+layer at (336,29) size 152x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 153x16
</span><span class="cx"> RenderText {#text} at (0,0) size 43x16
</span><span class="cx"> text run at (0,0) width 43: "regular"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintsearchfieldcancelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -12,11 +12,11 @@
</span><span class="cx"> RenderText {#text} at (362,0) size 328x18
</span><span class="cx"> text run at (362,0) width 328: ". The cancel button in a search field fails to redraw."
</span><span class="cx"> RenderBlock (anonymous) at (0,34) size 784x23
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,47) size 130x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 131x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastreplacedwidth100percentsearchfieldexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -11,22 +11,22 @@
</span><span class="cx"> RenderTableRow {TR} at (0,1) size 784x25
</span><span class="cx"> RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (1,1) size 4x19
</span><span class="cx"> text run at (1,2) width 4: " "
</span><span class="lines">@@ -38,22 +38,22 @@
</span><span class="cx"> RenderTableRow {TR} at (0,1) size 784x25
</span><span class="cx"> RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
</span><span class="cx"> RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (1,1) size 4x19
</span><span class="cx"> text run at (1,2) width 4: " "
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/Source/WebCore/ChangeLog 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-02-26 Zalan Bujtas <zalan@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-02-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement ::slotted pseudo element
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (197166 => 197167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-26 16:47:29 UTC (rev 197166)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-26 17:00:50 UTC (rev 197167)
</span><span class="lines">@@ -1659,6 +1659,19 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeMac::paintSearchFieldCancelButton(const RenderBox& box, const PaintInfo& paintInfo, const IntRect& r)
</span><span class="cx"> {
</span><ins>+ auto adjustedCancelButtonRect = [this, &box] (const FloatRect& localBoundsForCancelButton)
+ {
+ 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;
+ };
+
</ins><span class="cx"> if (!box.element())
</span><span class="cx"> return false;
</span><span class="cx"> Element* input = box.element()->shadowHost();
</span><span class="lines">@@ -1683,7 +1696,7 @@
</span><span class="cx">
</span><span class="cx"> float zoomLevel = box.style().effectiveZoom();
</span><span class="cx">
</span><del>- FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))];
</del><ins>+ FloatRect localBounds = adjustedCancelButtonRect([search cancelButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))]);
</ins><span class="cx"> FloatPoint paintingPos = convertToPaintingPosition(inputBox, box, localBounds.location(), r.location());
</span><span class="cx">
</span><span class="cx"> FloatRect unzoomedRect(paintingPos, localBounds.size());
</span><span class="lines">@@ -1694,7 +1707,6 @@
</span><span class="cx"> paintInfo.context().scale(FloatSize(zoomLevel, zoomLevel));
</span><span class="cx"> paintInfo.context().translate(-unzoomedRect.x(), -unzoomedRect.y());
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> [[search cancelButtonCell] drawWithFrame:unzoomedRect inView:documentViewFor(box)];
</span><span class="cx"> [[search cancelButtonCell] setControlView:nil];
</span><span class="cx"> return false;
</span><span class="lines">@@ -1702,7 +1714,7 @@
</span><span class="cx">
</span><span class="cx"> const IntSize* RenderThemeMac::cancelButtonSizes() const
</span><span class="cx"> {
</span><del>- static const IntSize sizes[3] = { IntSize(16, 13), IntSize(13, 11), IntSize(13, 9) };
</del><ins>+ static const IntSize sizes[3] = { IntSize(22, 22), IntSize(19, 19), IntSize(15, 15) };
</ins><span class="cx"> return sizes;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>