Title: [198497] trunk
Revision
198497
Author
za...@apple.com
Date
2016-03-21 13:13:25 -0700 (Mon, 21 Mar 2016)

Log Message

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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (198496 => 198497)


--- trunk/LayoutTests/ChangeLog	2016-03-21 19:28:53 UTC (rev 198496)
+++ trunk/LayoutTests/ChangeLog	2016-03-21 20:13:25 UTC (rev 198497)
@@ -1,3 +1,31 @@
+2016-03-21  Zalan Bujtas  <za...@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:
+
 2016-03-21  Eric Carlson  <eric.carl...@apple.com>
 
         Add a WebRTC specific compile flag

Modified: trunk/LayoutTests/fast/forms/search/search-padding-cancel-results-buttons-expected.txt (198496 => 198497)


--- 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)
@@ -5,7 +5,7 @@
     RenderBody {BODY} at (8,8) size 784x584
       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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 131x13
           RenderBlock {DIV} at (152,0) size 20x19
       RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/css/focus-ring-exists-for-search-field-expected.txt (198496 => 198497)


--- 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)
@@ -10,7 +10,7 @@
       RenderBlock (anonymous) at (0,52) size 784x23
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/css/text-input-with-webkit-border-radius-expected.txt (198496 => 198497)


--- 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)
@@ -17,7 +17,7 @@
       RenderBlock {DIV} at (0,68) size 163x45 [bgcolor=#888888]
         RenderTextControl {INPUT} at (11,9) size 133x19 [bgcolor=#00FF00] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 127x19
-            RenderBlock {DIV} at (0,4) size 8x11
+            RenderBlock {DIV} at (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 100x13
             RenderBlock {DIV} at (108,0) size 19x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/css/text-overflow-input-expected.txt (198496 => 198497)


--- 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)
@@ -15,7 +15,7 @@
           text run at (140,20) width 5: " "
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (311,20) size 5x18
@@ -25,7 +25,7 @@
           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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (627,20) size 5x18
@@ -39,7 +39,7 @@
           text run at (140,43) width 5: " "
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (311,43) size 5x18
@@ -49,7 +49,7 @@
           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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (627,43) size 5x18
@@ -67,7 +67,7 @@
           text run at (140,20) width 5: " "
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (311,20) size 5x18
@@ -77,7 +77,7 @@
           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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (627,20) size 5x18
@@ -91,7 +91,7 @@
           text run at (140,43) width 5: " "
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (311,43) size 5x18
@@ -101,7 +101,7 @@
           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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (627,43) size 5x18

Modified: trunk/LayoutTests/platform/mac/fast/forms/box-shadow-override-expected.txt (198496 => 198497)


--- 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)
@@ -12,21 +12,21 @@
       RenderBlock {DIV} at (0,68) size 784x23
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,91) size 784x23
         RenderTextControl {INPUT} at (2,2) size 173x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 167x19
-            RenderBlock {DIV} at (0,4) size 17x11
+            RenderBlock {DIV} at (0,0) size 17x19
             RenderBlock {DIV} at (17,3) size 131x13
             RenderBlock {DIV} at (147,0) size 20x19
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,114) size 784x23
         RenderTextControl {INPUT} at (2,2) size 178x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 172x19
-            RenderBlock {DIV} at (0,4) size 22x11
+            RenderBlock {DIV} at (0,0) size 22x19
             RenderBlock {DIV} at (22,3) size 131x13
             RenderBlock {DIV} at (152,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/control-restrict-line-height-expected.txt (198496 => 198497)


--- 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)
@@ -22,7 +22,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 8x19
           RenderBlock {DIV} at (8,3) size 131x13
           RenderBlock {DIV} at (138,0) size 20x19
       RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.txt (198496 => 198497)


--- 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)
@@ -92,7 +92,7 @@
           text run at (0,237) width 45: "search "
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.txt (198496 => 198497)


--- 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)
@@ -5,7 +5,7 @@
     RenderBody {BODY} at (8,8) size 784x584
       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 (0,0) size 8x19
           RenderBlock {DIV} at (8,3) size 131x13
           RenderBlock {DIV} at (138,0) size 20x19
       RenderBR {BR} at (167,16) size 1x0
@@ -13,13 +13,13 @@
       RenderBR {BR} at (140,39) size 1x0
       RenderTextControl {INPUT} at (2,48) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderFlexibleBox {DIV} at (3,0) size 158x19
-          RenderBlock {DIV} at (0,4) size 8x11
+          RenderBlock {DIV} at (0,0) size 8x19
           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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 131x13
           RenderBlock {DIV} at (152,0) size 20x19
       RenderBR {BR} at (181,85) size 1x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/placeholder-pseudo-style-expected.txt (198496 => 198497)


--- 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)
@@ -11,7 +11,7 @@
         text run at (140,20) width 5: " "
       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 (0,0) size 8x19
           RenderBlock {DIV} at (8,3) size 131x13
           RenderBlock {DIV} at (138,0) size 20x19
       RenderText {#text} at (311,20) size 5x18

Modified: trunk/LayoutTests/platform/mac/fast/forms/search/search-size-with-decorations-expected.txt (198496 => 198497)


--- 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)
@@ -5,7 +5,7 @@
     RenderBody {BODY} at (8,8) size 784x161
       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 (0,0) size 8x19
           RenderBlock {DIV} at (8,3) size 131x13
           RenderBlock {DIV} at (138,0) size 20x19
       RenderText {#text} at (167,2) size 5x18
@@ -13,7 +13,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 8x19
           RenderBlock {DIV} at (8,3) size 131x13
           RenderBlock {DIV} at (138,0) size 20x19
       RenderText {#text} at (167,25) size 5x18
@@ -21,7 +21,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 17x19
           RenderBlock {DIV} at (17,3) size 131x13
           RenderBlock {DIV} at (147,0) size 20x19
       RenderText {#text} at (176,48) size 5x18
@@ -29,7 +29,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 17x19
           RenderBlock {DIV} at (17,3) size 131x13
           RenderBlock {DIV} at (147,0) size 20x19
       RenderText {#text} at (176,71) size 5x18
@@ -37,7 +37,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 131x13
           RenderBlock {DIV} at (152,0) size 20x19
       RenderText {#text} at (181,94) size 5x18
@@ -45,7 +45,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 131x13
           RenderBlock {DIV} at (152,0) size 20x19
       RenderText {#text} at (181,117) size 5x18
@@ -53,7 +53,7 @@
       RenderBR {BR} at (0,0) size 0x0
       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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 261x13
           RenderBlock {DIV} at (282,0) size 20x19
       RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/search-cancel-button-style-sharing-expected.txt (198496 => 198497)


--- 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)
@@ -9,14 +9,14 @@
       RenderBlock (anonymous) at (0,34) size 784x23
         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 (0,0) size 8x19
             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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/search-display-none-cancel-button-expected.txt (198496 => 198497)


--- 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)
@@ -7,9 +7,9 @@
         text run at (0,0) width 510: "This tests that the display:none style will work on a search field's cancel button."
       RenderBR {BR} at (509,14) size 1x0
       RenderTextControl {INPUT} at (2,20) size 164x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderFlexibleBox {DIV} at (3,3) size 158x13
-          RenderBlock {DIV} at (0,1) size 8x11
-          RenderBlock {DIV} at (8,0) size 150x13
+        RenderFlexibleBox {DIV} at (3,0) size 158x19
+          RenderBlock {DIV} at (0,0) size 8x19
+          RenderBlock {DIV} at (8,3) size 150x13
       RenderText {#text} at (0,0) size 0x0
 layer at (21,31) size 149x13
   RenderBlock {DIV} at (0,0) size 150x13

Modified: trunk/LayoutTests/platform/mac/fast/forms/search-rtl-expected.txt (198496 => 198497)


--- 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)
@@ -18,7 +18,7 @@
       RenderBlock {P} at (0,34) size 784x69
         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 (0,0) size 22x19
             RenderBlock {DIV} at (22,3) size 131x13
             RenderBlock {DIV} at (152,0) size 20x19
         RenderText {#text} at (181,2) size 5x18
@@ -26,7 +26,7 @@
         RenderBR {BR} at (0,0) size 0x0
         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 (0,0) size 22x19
             RenderBlock {DIV} at (22,3) size 196x13
             RenderBlock {DIV} at (217,0) size 20x19
         RenderText {#text} at (246,25) size 5x18
@@ -34,7 +34,7 @@
         RenderBR {BR} at (0,0) size 0x0
         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 (0,0) size 22x19
             RenderBlock {DIV} at (22,3) size 131x13
             RenderBlock {DIV} at (152,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/search-styled-expected.txt (198496 => 198497)


--- 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)
@@ -5,7 +5,7 @@
     RenderBody {BODY} at (8,8) size 784x23
       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 (0,0) size 22x19
           RenderBlock {DIV} at (22,3) size 131x13
           RenderBlock {DIV} at (152,0) size 20x19
       RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt (198496 => 198497)


--- 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)
@@ -13,7 +13,7 @@
       RenderBlock {P} at (0,52) size 784x45
         RenderTextControl {INPUT} at (2,0) size 173x45 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,3) size 167x39
-            RenderBlock {DIV} at (0,14) size 17x11
+            RenderBlock {DIV} at (0,10) size 17x19
             RenderBlock {DIV} at (17,13) size 131x13
             RenderBlock {DIV} at (147,10) size 20x19
         RenderText {#text} at (176,13) size 5x18
@@ -23,7 +23,7 @@
       RenderBlock {P} at (0,113) size 784x18
         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 (0,0) size 17x19
             RenderBlock {DIV} at (17,1) size 131x14
             RenderBlock {DIV} at (147,0) size 20x19
         RenderText {#text} at (176,0) size 5x18
@@ -33,7 +33,7 @@
       RenderBlock {P} at (0,147) size 784x18
         RenderTextControl {INPUT} at (2,5) size 173x12 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderFlexibleBox {DIV} at (3,0) size 167x12
-            RenderBlock {DIV} at (0,0) size 17x12
+            RenderBlock {DIV} at (0,0) size 17x19
             RenderBlock {DIV} at (17,3) size 131x6
             RenderBlock {DIV} at (147,0) size 20x19
         RenderText {#text} at (176,0) size 5x18

Modified: trunk/LayoutTests/platform/mac/fast/forms/searchfield-heights-expected.txt (198496 => 198497)


--- 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)
@@ -8,21 +8,21 @@
       RenderBR {BR} at (375,14) size 1x0
       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 (0,0) size 8x15
           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 (0,0) size 8x19
           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 (0,0) size 10x22
           RenderBlock {DIV} at (10,3) size 153x16
           RenderBlock {DIV} at (162,0) size 23x22
       RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/repaint/search-field-cancel-expected.txt (198496 => 198497)


--- 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)
@@ -14,7 +14,7 @@
       RenderBlock (anonymous) at (0,34) size 784x23
         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 (0,0) size 8x19
             RenderBlock {DIV} at (8,3) size 131x13
             RenderBlock {DIV} at (138,0) size 20x19
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/mac/fast/replaced/width100percent-searchfield-expected.txt (198496 => 198497)


--- 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)
@@ -12,19 +12,19 @@
             RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 8x11
+                  RenderBlock {DIV} at (0,0) size 8x19
                   RenderBlock {DIV} at (8,3) size 0x13
                   RenderBlock {DIV} at (8,0) size 19x19
             RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 8x11
+                  RenderBlock {DIV} at (0,0) size 8x19
                   RenderBlock {DIV} at (8,3) size 0x13
                   RenderBlock {DIV} at (8,0) size 19x19
             RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 8x11
+                  RenderBlock {DIV} at (0,0) size 8x19
                   RenderBlock {DIV} at (8,3) size 0x13
                   RenderBlock {DIV} at (8,0) size 19x19
             RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]
@@ -39,19 +39,19 @@
             RenderTableCell {TD} at (1,1) size 8x25 [r=0 c=0 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 22x11
+                  RenderBlock {DIV} at (0,0) size 22x19
                   RenderBlock {DIV} at (22,3) size 0x13
                   RenderBlock {DIV} at (22,0) size 19x19
             RenderTableCell {TD} at (10,1) size 8x25 [r=0 c=1 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 22x11
+                  RenderBlock {DIV} at (0,0) size 22x19
                   RenderBlock {DIV} at (22,3) size 0x13
                   RenderBlock {DIV} at (22,0) size 19x19
             RenderTableCell {TD} at (19,1) size 8x25 [r=0 c=2 rs=1 cs=1]
               RenderTextControl {INPUT} at (1,3) size 6x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderFlexibleBox {DIV} at (3,0) size 0x19
-                  RenderBlock {DIV} at (0,4) size 22x11
+                  RenderBlock {DIV} at (0,0) size 22x19
                   RenderBlock {DIV} at (22,3) size 0x13
                   RenderBlock {DIV} at (22,0) size 19x19
             RenderTableCell {TD} at (28,3) size 755x21 [r=0 c=3 rs=1 cs=1]

Modified: trunk/Source/WebCore/ChangeLog (198496 => 198497)


--- 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)
@@ -1,3 +1,18 @@
+2016-03-21  Zalan Bujtas  <za...@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):
+
 2016-03-21  Per Arne Vollan  <pe...@outlook.com>
 
         [WinCairo][MediaFoundation] Crash when media player is destroyed.

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (198496 => 198497)


--- 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)
@@ -1750,9 +1750,10 @@
     style.setBoxShadow(nullptr);
 }
 
+const int resultsArrowWidth = 5;
 const IntSize* RenderThemeMac::resultsButtonSizes() const
 {
-    static const IntSize sizes[3] = { IntSize(19, 13), IntSize(17, 11), IntSize(17, 9) };
+    static const IntSize sizes[3] = { IntSize(19, 22), IntSize(17, 19), IntSize(17, 15) };
     return sizes;
 }
 
@@ -1806,7 +1807,6 @@
     return false;
 }
 
-const int resultsArrowWidth = 5;
 void RenderThemeMac::adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle& style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
@@ -1817,6 +1817,20 @@
 
 bool RenderThemeMac::paintSearchFieldResultsButton(const RenderBox& box, const PaintInfo& paintInfo, const IntRect& r)
 {
+    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;
+    };
+
     Element* input = box.element()->shadowHost();
     if (!input)
         input = box.element();
@@ -1835,7 +1849,7 @@
     GraphicsContextStateSaver stateSaver(paintInfo.context());
     float zoomLevel = box.style().effectiveZoom();
 
-    FloatRect localBounds = [search searchButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))];
+    FloatRect localBounds = adjustedResultButtonRect([search searchButtonRectForBounds:NSRect(snappedIntRect(inputBox.contentBoxRect()))]);
     FloatPoint paintingPos = convertToPaintingPosition(inputBox, box, localBounds.location(), r.location());
     
     FloatRect unzoomedRect(paintingPos, localBounds.size());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to