Changeset 187310 in webkit

Timestamp:

Jul 24, 2015, 12:54:04 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187170. rdar://problem/21901076

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187170. rdar://problem/21901076
+
+    2015-07-22  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Search fields render placeholder text improperly.
+            https://bugs.webkit.org/show_bug.cgi?id=147192
+            <rdar://problem/21901076>
+
+            Reviewed by Alexey Proskuryakov.
+
+            Due to changes in the way AppKit renders search inputs, we must now explicitly
+            set the placeholder text of a search input rendered using the Mac theme to be
+            an empty string when rendering the search input box (not including the actual
+            placeholder text).
+
+            * rendering/RenderThemeMac.mm:
+            (WebCore::RenderThemeMac::setSearchCellState): Force the placeholder text of
+                the NSSearchFieldCell for the Mac theme to be an empty string.
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1632 +1632 @@
     NSSearchFieldCell* search = this->search();
 
+    [search setPlaceholderString:@""];
     [search setControlSize:controlSizeForFont(o.style())];