Changeset 102734 in webkit

Timestamp:

Dec 13, 2011 8:59:33 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

HTML details summary not working with form controls
​https://bugs.webkit.org/show_bug.cgi?id=74398

Patch by Hajime Morrita <​morrita@chromium.org> on 2011-12-13
Reviewed by Kent Tamura.

Source/WebCore:

Allowed HTMLSummaryElement to skip the toggle logic if the event
target is a form control.

Test: fast/html/details-click-controls.html

• html/HTMLSummaryElement.cpp:

(WebCore::isClickableControl):
(WebCore::HTMLSummaryElement::defaultEventHandler):

LayoutTests:

• fast/html/details-click-controls-expected.txt: Added.
• fast/html/details-click-controls.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/html/details-click-controls-expected.txt (added)
• LayoutTests/fast/html/details-click-controls.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSummaryElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-13  Hajime Morrita  <morrita@chromium.org>
+
+        HTML details summary not working with form controls
+        https://bugs.webkit.org/show_bug.cgi?id=74398
+
+        Reviewed by Kent Tamura.
+
+        * fast/html/details-click-controls-expected.txt: Added.
+        * fast/html/details-click-controls.html: Added.
+
 2011-12-13  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-13  Hajime Morrita  <morrita@chromium.org>
+
+        HTML details summary not working with form controls
+        https://bugs.webkit.org/show_bug.cgi?id=74398
+
+        Reviewed by Kent Tamura.
+
+        Allowed HTMLSummaryElement to skip the toggle logic if the event
+        target is a form control.
+
+        Test: fast/html/details-click-controls.html
+
+        * html/HTMLSummaryElement.cpp:
+        (WebCore::isClickableControl):
+        (WebCore::HTMLSummaryElement::defaultEventHandler):
+
 2011-12-13  James Wei <james.wei@intel.com> 
 

trunk/Source/WebCore/html/HTMLSummaryElement.cpp

@@ -94 +94 @@
 }
 
+static bool isClickableControl(Node* node)
+{
+    if (!node->isElementNode())
+        return false;
+    Element* element = toElement(node);
+    if (element->isFormControlElement())
+        return true;
+    Element* host = toElement(element->shadowAncestorNode());
+    return host && host->isFormControlElement();
+}
+
 void HTMLSummaryElement::defaultEventHandler(Event* event)
 {
@@ -99 +110 @@
     if (!isMainSummary() || !renderer() || !renderer()->isSummary() || !event->isMouseEvent() || event->type() != eventNames().clickEvent || event->defaultHandled())
         return;
-
     MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
     if (mouseEvent->button() != LeftButton)
+        return;
+    if (isClickableControl(event->target()->toNode()))
         return;