Changeset 104332 in webkit

Timestamp:

Jan 6, 2012 1:55:12 PM (12 years ago)

Author:

jonlee@apple.com

Message:

Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
​https://bugs.webkit.org/show_bug.cgi?id=69886
<rdar://problem/10070187>

Reviewed by Adele Peterson.

.:

• ManualTests/search-cancel-button.html: Added.

Source/WebCore:

Tests: ManualTests/search-cancel-button.html

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintSearchFieldCancelButton): If the input is readonly and/or disabled, force the cell to
render without highlight.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/search-cancel-button.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-01-04  Jon Lee  <jonlee@apple.com>
+
+        Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
+        https://bugs.webkit.org/show_bug.cgi?id=69886
+        <rdar://problem/10070187>
+
+        Reviewed by Adele Peterson.
+
+        * ManualTests/search-cancel-button.html: Added.
+
 2012-01-06  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-04  Jon Lee  <jonlee@apple.com>
+
+        Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
+        https://bugs.webkit.org/show_bug.cgi?id=69886
+        <rdar://problem/10070187>
+
+        Reviewed by Adele Peterson.
+
+        Tests: ManualTests/search-cancel-button.html
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSearchFieldCancelButton): If the input is readonly and/or disabled, force the cell to
+        render without highlight.
+
 2012-01-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1512 +1512 @@
 bool RenderThemeMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
-    Node* input = o->node()->shadowAncestorNode();
+    Element* input = toElement(o->node()->shadowAncestorNode());
+    ASSERT(input);
+
     if (!input->renderer()->isBox())
         return false;
@@ -1521 +1523 @@
     NSSearchFieldCell* search = this->search();
 
-    updateActiveState([search cancelButtonCell], o);
-    updatePressedState([search cancelButtonCell], o);
+    if (input->isEnabledFormControl() && !input->isReadOnlyFormControl()) {
+        updateActiveState([search cancelButtonCell], o);
+        updatePressedState([search cancelButtonCell], o);
+    }
+    else if ([[search cancelButtonCell] isHighlighted])
+        [[search cancelButtonCell] setHighlighted:NO];
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);