Changeset 90225 in webkit

Timestamp:

Jul 1, 2011, 6:58:18 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2011-07-01 Kentaro Hara <​haraken@google.com>

Reviewed by Kent Tamura.

Disallow clicking an [X] button in 'search' input forms when 'disabled' attribute or 'readonly' attribute is set.
​https://bugs.webkit.org/show_bug.cgi?id=63709

Added a test that checks whether the content in 'search' input forms with 'disabled' attribute
or 'readonly' attribute is cleared or not, when an [X] button is clicked.

• fast/forms/search-disabled-readonly-expected.txt: Added.
• fast/forms/search-disabled-readonly.html: Added.

2011-07-01 Kentaro Hara <​haraken@google.com>

Reviewed by Kent Tamura.

Disallow clicking an [X] button in 'search' input forms when 'disabled' attribute or 'readonly' attribute is set.
​https://bugs.webkit.org/show_bug.cgi?id=63709

Ignore a cancel button event on a 'search' input form if 'disabled' attribute or
'readonly' attribute is set to the input form.

Test: fast/forms/search-disabled-readonly.html

• html/shadow/TextControlInnerElements.cpp: (WebCore::SearchFieldCancelButtonElement::defaultEventHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/search-disabled-readonly-expected.txt (added)
• LayoutTests/fast/forms/search-disabled-readonly.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/TextControlInnerElements.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-01  Kentaro Hara  <haraken@google.com>
+
+        Reviewed by Kent Tamura.
+
+        Disallow clicking an [X] button in 'search' input forms when 'disabled' attribute or 'readonly' attribute is set.
+        https://bugs.webkit.org/show_bug.cgi?id=63709
+
+        Added a test that checks whether the content in 'search' input forms with 'disabled' attribute
+        or 'readonly' attribute is cleared or not, when an [X] button is clicked.
+
+        * fast/forms/search-disabled-readonly-expected.txt: Added.
+        * fast/forms/search-disabled-readonly.html: Added.
+
 2011-07-01  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-01  Kentaro Hara  <haraken@google.com>
+
+        Reviewed by Kent Tamura.
+
+        Disallow clicking an [X] button in 'search' input forms when 'disabled' attribute or 'readonly' attribute is set.
+        https://bugs.webkit.org/show_bug.cgi?id=63709
+
+        Ignore a cancel button event on a 'search' input form if 'disabled' attribute or
+        'readonly' attribute is set to the input form.
+
+        Test: fast/forms/search-disabled-readonly.html
+
+        * html/shadow/TextControlInnerElements.cpp:
+        (WebCore::SearchFieldCancelButtonElement::defaultEventHandler):
+
 2011-06-30  Mikhail Naganov  <mnaganov@chromium.org>
 

trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

@@ -193 +193 @@
     // If the element is visible, on mouseup, clear the value, and set selection
     RefPtr<HTMLInputElement> input(static_cast<HTMLInputElement*>(shadowAncestorNode()));
+    if (input->disabled() || input->isReadOnlyFormControl()) {
+        if (!event->defaultHandled())
+            HTMLDivElement::defaultEventHandler(event);
+        return;
+    }
+
     if (event->type() == eventNames().mousedownEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
         if (renderer() && renderer()->visibleToHitTesting()) {