<!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>[198497] 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/198497">198497</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-21 13:13:25 -0700 (Mon, 21 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector search icon does not fit when zoomed in.
https://bugs.webkit.org/show_bug.cgi?id=155708
Reviewed by Simon Fraser.
Adjusts the paint rect for the magnifier icon so that it fits even when zoomed in.
Source/WebCore:
Covered by existing tests.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::resultsButtonSizes):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/ChangeLog 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-03-21 Zalan Bujtas <zalan@apple.com>
+
+ Web Inspector search icon does not fit when zoomed in.
+ https://bugs.webkit.org/show_bug.cgi?id=155708
+
+ Reviewed by Simon Fraser.
+
+ Adjusts the paint rect for the magnifier icon so that it fits even when zoomed 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:
+
</ins><span class="cx"> 2016-03-21 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a WebRTC specific compile flag
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 196x43 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (12,12) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,52) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -17,7 +17,7 @@
</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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 127x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 100x13
</span><span class="cx"> RenderBlock {DIV} at (108,0) size 19x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsstextoverflowinputexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> text run at (140,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (311,20) size 5x18
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> text run at (456,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (462,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (627,20) size 5x18
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> text run at (140,43) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (146,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (311,43) size 5x18
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> text run at (456,43) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (462,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (627,43) size 5x18
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> text run at (140,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (311,20) size 5x18
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> text run at (456,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (462,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (627,20) size 5x18
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> text run at (140,43) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (146,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (311,43) size 5x18
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> text run at (456,43) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (462,43) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (627,43) size 5x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsboxshadowoverrideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -12,21 +12,21 @@
</span><span class="cx"> RenderBlock {DIV} at (0,68) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {DIV} at (0,91) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 167x19
</span><del>- RenderBlock {DIV} at (0,4) size 17x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (147,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {DIV} at (0,114) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,64) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsinputappearanceheightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> text run at (0,237) width 45: "search "
</span><span class="cx"> RenderTextControl {INPUT} at (46,237) size 165x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformsplaceholderpositionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderBR {BR} at (167,16) size 1x0
</span><span class="lines">@@ -13,13 +13,13 @@
</span><span class="cx"> RenderBR {BR} at (140,39) size 1x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,48) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderBR {BR} at (167,62) size 1x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,71) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderBR {BR} at (181,85) 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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> text run at (140,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (146,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (311,20) size 5x18
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x161
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (167,2) size 5x18
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,25) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (167,25) size 5x18
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,48) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 167x19
</span><del>- RenderBlock {DIV} at (0,4) size 17x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (147,0) size 20x19
</span><span class="cx"> RenderText {#text} at (176,48) size 5x18
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,71) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 167x19
</span><del>- RenderBlock {DIV} at (0,4) size 17x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (147,0) size 20x19
</span><span class="cx"> RenderText {#text} at (176,71) size 5x18
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,94) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (181,94) size 5x18
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,117) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (181,117) size 5x18
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,140) size 308x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 302x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 261x13
</span><span class="cx"> RenderBlock {DIV} at (282,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -9,14 +9,14 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,34) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (167,2) size 5x18
</span><span class="cx"> text run at (167,2) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (173,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</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 (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -7,9 +7,9 @@
</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><span class="cx"> RenderTextControl {INPUT} at (2,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><del>- RenderFlexibleBox {DIV} at (3,3) size 158x13
- RenderBlock {DIV} at (0,1) size 8x11
- RenderBlock {DIV} at (8,0) size 150x13
</del><ins>+ RenderFlexibleBox {DIV} at (3,0) size 158x19
+ RenderBlock {DIV} at (0,0) size 8x19
+ RenderBlock {DIV} at (8,3) size 150x13
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> layer at (21,31) size 149x13
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 150x13
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchrtlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> RenderBlock {P} at (0,34) size 784x69
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (181,2) size 5x18
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,25) size 243x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 237x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 196x13
</span><span class="cx"> RenderBlock {DIV} at (217,0) size 20x19
</span><span class="cx"> RenderText {#text} at (246,25) size 5x18
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x0
</span><span class="cx"> RenderTextControl {INPUT} at (2,48) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchstyledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 172x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (152,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchverticalalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> RenderBlock {P} at (0,52) size 784x45
</span><span class="cx"> RenderTextControl {INPUT} at (2,0) size 173x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,3) size 167x39
</span><del>- RenderBlock {DIV} at (0,14) size 17x11
</del><ins>+ RenderBlock {DIV} at (0,10) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,13) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (147,10) size 20x19
</span><span class="cx"> RenderText {#text} at (176,13) size 5x18
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> RenderBlock {P} at (0,113) size 784x18
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 173x16 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 167x16
</span><del>- RenderBlock {DIV} at (0,2) size 17x12
</del><ins>+ RenderBlock {DIV} at (0,0) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,1) size 131x14
</span><span class="cx"> RenderBlock {DIV} at (147,0) size 20x19
</span><span class="cx"> RenderText {#text} at (176,0) size 5x18
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> RenderBlock {P} at (0,147) size 784x18
</span><span class="cx"> RenderTextControl {INPUT} at (2,5) size 173x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 167x12
</span><del>- RenderBlock {DIV} at (0,0) size 17x12
</del><ins>+ RenderBlock {DIV} at (0,0) size 17x19
</ins><span class="cx"> RenderBlock {DIV} at (17,3) size 131x6
</span><span class="cx"> RenderBlock {DIV} at (147,0) size 20x19
</span><span class="cx"> RenderText {#text} at (176,0) size 5x18
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastformssearchfieldheightsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -8,21 +8,21 @@
</span><span class="cx"> RenderBR {BR} at (375,14) size 1x0
</span><span class="cx"> RenderTextControl {INPUT} at (0,22) size 139x17 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,1) size 133x15
</span><del>- RenderBlock {DIV} at (0,3) size 8x9
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x15
</ins><span class="cx"> RenderBlock {DIV} at (8,2) size 110x11
</span><span class="cx"> RenderBlock {DIV} at (117,0) size 16x15
</span><span class="cx"> RenderText {#text} at (138,20) size 5x18
</span><span class="cx"> text run at (138,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (144,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (309,20) size 5x18
</span><span class="cx"> text run at (309,20) width 5: " "
</span><span class="cx"> RenderTextControl {INPUT} at (315,18) size 191x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 185x22
</span><del>- RenderBlock {DIV} at (0,4) size 10x14
</del><ins>+ RenderBlock {DIV} at (0,0) size 10x22
</ins><span class="cx"> RenderBlock {DIV} at (10,3) size 153x16
</span><span class="cx"> RenderBlock {DIV} at (162,0) size 23x22
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintsearchfieldcancelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,34) size 784x23
</span><span class="cx"> RenderTextControl {INPUT} at (2,2) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
</span><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 158x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 131x13
</span><span class="cx"> RenderBlock {DIV} at (138,0) size 20x19
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastreplacedwidth100percentsearchfieldexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -12,19 +12,19 @@
</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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (8,0) size 19x19
</span><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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (8,0) size 19x19
</span><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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 8x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 8x19
</ins><span class="cx"> RenderBlock {DIV} at (8,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (8,0) size 19x19
</span><span class="cx"> RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
</span><span class="lines">@@ -39,19 +39,19 @@
</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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (22,0) size 19x19
</span><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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (22,0) size 19x19
</span><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><span class="cx"> RenderFlexibleBox {DIV} at (3,0) size 0x19
</span><del>- RenderBlock {DIV} at (0,4) size 22x11
</del><ins>+ RenderBlock {DIV} at (0,0) size 22x19
</ins><span class="cx"> RenderBlock {DIV} at (22,3) size 0x13
</span><span class="cx"> RenderBlock {DIV} at (22,0) size 19x19
</span><span class="cx"> RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/Source/WebCore/ChangeLog 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-21 Zalan Bujtas <zalan@apple.com>
+
+ Web Inspector search icon does not fit when zoomed in.
+ https://bugs.webkit.org/show_bug.cgi?id=155708
+
+ Reviewed by Simon Fraser.
+
+ Adjusts the paint rect for the magnifier icon so that it fits even when zoomed in.
+
+ Covered by existing tests.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::resultsButtonSizes):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+
</ins><span class="cx"> 2016-03-21 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo][MediaFoundation] Crash when media player is destroyed.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (198496 => 198497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-03-21 20:13:25 UTC (rev 198497)
</span><span class="lines">@@ -1750,9 +1750,10 @@
</span><span class="cx"> style.setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const int resultsArrowWidth = 5;
</ins><span class="cx"> const IntSize* RenderThemeMac::resultsButtonSizes() const
</span><span class="cx"> {
</span><del>- static const IntSize sizes[3] = { IntSize(19, 13), IntSize(17, 11), IntSize(17, 9) };
</del><ins>+ static const IntSize sizes[3] = { IntSize(19, 22), IntSize(17, 19), IntSize(17, 15) };
</ins><span class="cx"> return sizes;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1806,7 +1807,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const int resultsArrowWidth = 5;
</del><span class="cx"> void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
</span><span class="cx"> {
</span><span class="cx"> IntSize size = sizeForSystemFont(style, resultsButtonSizes());
</span><span class="lines">@@ -1817,6 +1817,20 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeMac::paintSearchFieldResultsButton(const RenderBox& box, const PaintInfo& paintInfo, const IntRect& r)
</span><span class="cx"> {
</span><ins>+ auto adjustedResultButtonRect = [this, &box] (const FloatRect& localBounds) -> FloatRect
+ {
+ IntSize buttonSize = sizeForSystemFont(box.style(), resultsButtonSizes());
+ buttonSize.expand(resultsArrowWidth, 0);
+ FloatSize diff = localBounds.size() - FloatSize(buttonSize);
+ if (!diff.isZero())
+ return localBounds;
+ // Vertically centered and left aligned.
+ FloatRect adjustedLocalBounds = localBounds;
+ adjustedLocalBounds.move(0, floorToDevicePixel(diff.height() / 2, box.document().deviceScaleFactor()));
+ adjustedLocalBounds.setSize(buttonSize);
+ return adjustedLocalBounds;
+ };
+
</ins><span class="cx"> Element* input = box.element()->shadowHost();
</span><span class="cx"> if (!input)
</span><span class="cx"> input = box.element();
</span><span class="lines">@@ -1835,7 +1849,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><span class="cx"> float zoomLevel = box.style().effectiveZoom();
</span><span class="cx">
</span><del>- FloatRect localBounds = [search searchButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))];
</del><ins>+ FloatRect localBounds = adjustedResultButtonRect([search searchButtonRectForBounds: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></pre>
</div>
</div>
</body>
</html>