Changeset 112515 in webkit

Timestamp:

Mar 29, 2012 3:14:32 AM (12 years ago)

Author:

zeno.albisser@nokia.com

Message:

Fieldset disabled attribute does not work.
​https://bugs.webkit.org/show_bug.cgi?id=58837

Source/WebCore:

Make HTMLFormControlElements inherit the disabled state
from HTMLFieldSetElement ancestors. Subordinates of the
first HTMLLegendElement in a fieldset will never be disabled.

Patch by Zeno Albisser <​zeno@webkit.org>

Test: fast/forms/fieldset-disabled.html

Reviewed by Kent Tamura.

• html/HTMLFieldSetElement.cpp:

(WebCore::HTMLFieldSetElement::disabledAttributeChanged):
(WebCore):
(WebCore::HTMLFieldSetElement::legend):

• html/HTMLFieldSetElement.h:

(HTMLFieldSetElement):

• html/HTMLFieldSetElement.idl:
• html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::HTMLFormControlElement):
(WebCore::HTMLFormControlElement::updateFieldSetAndLegendAncestor):
(WebCore):
(WebCore::HTMLFormControlElement::parseAttribute):
(WebCore::HTMLFormControlElement::disabledAttributeChanged):
(WebCore::HTMLFormControlElement::removedFromTree):
(WebCore::HTMLFormControlElement::disabled):

• html/HTMLFormControlElement.h:

(WebCore):
(HTMLFormControlElement):

LayoutTests:

Add a test case for fieldset disabled attribute.

Reviewed by Kent Tamura.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/fieldset/fieldset-disabled-expected.txt (added)
• LayoutTests/fast/forms/fieldset/fieldset-disabled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLFieldSetElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLFieldSetElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLFieldSetElement.idl (modified) (1 diff)
• Source/WebCore/html/HTMLFormControlElement.cpp (modified) (7 diffs)
• Source/WebCore/html/HTMLFormControlElement.h (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-29  Zeno Albisser  <zeno@webkit.org>
+
+        Fieldset disabled attribute does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=58837
+
+        Add a test case for fieldset disabled attribute.
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/fieldset/fieldset-disabled-expected.txt: Added.
+        * fast/forms/fieldset/fieldset-disabled.html: Added.
+
 2012-03-29  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-29  Zeno Albisser  <zeno@webkit.org>
+
+        Fieldset disabled attribute does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=58837
+
+        Make HTMLFormControlElements inherit the disabled state
+        from HTMLFieldSetElement ancestors. Subordinates of the
+        first HTMLLegendElement in a fieldset will never be disabled.
+
+        Patch by Zeno Albisser <zeno@webkit.org>
+
+        Test: fast/forms/fieldset-disabled.html
+
+        Reviewed by Kent Tamura.
+
+        * html/HTMLFieldSetElement.cpp:
+        (WebCore::HTMLFieldSetElement::disabledAttributeChanged):
+        (WebCore):
+        (WebCore::HTMLFieldSetElement::legend):
+        * html/HTMLFieldSetElement.h:
+        (HTMLFieldSetElement):
+        * html/HTMLFieldSetElement.idl:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::HTMLFormControlElement):
+        (WebCore::HTMLFormControlElement::updateFieldSetAndLegendAncestor):
+        (WebCore):
+        (WebCore::HTMLFormControlElement::parseAttribute):
+        (WebCore::HTMLFormControlElement::disabledAttributeChanged):
+        (WebCore::HTMLFormControlElement::removedFromTree):
+        (WebCore::HTMLFormControlElement::disabled):
+        * html/HTMLFormControlElement.h:
+        (WebCore):
+        (HTMLFormControlElement):
+
 2012-03-29  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

@@ -25 +25 @@
 #include "config.h"
 #include "HTMLFieldSetElement.h"
+#include "HTMLLegendElement.h"
 
 #include "HTMLNames.h"
@@ -45 +46 @@
 }
 
+void HTMLFieldSetElement::disabledAttributeChanged()
+{
+    // This element must be updated before the style of nodes in its subtree gets recalculated.
+    HTMLFormControlElement::disabledAttributeChanged();
+
+    for (Node* currentNode = this; currentNode; currentNode = currentNode->traverseNextNode(this)) {
+        HTMLElement* element = toHTMLElement(currentNode);
+        if (element && element->isFormControlElement())
+            static_cast<HTMLFormControlElement*>(element)->setNeedsStyleRecalc();
+    }
+}
+
 bool HTMLFieldSetElement::supportsFocus() const
 {
@@ -61 +74 @@
 }
 
+HTMLLegendElement* HTMLFieldSetElement::legend() const
+{
+    for (Element* node = firstElementChild(); node; node = node->nextElementSibling()) {
+        if (node->hasTagName(legendTag))
+            return static_cast<HTMLLegendElement*>(node);
+    }
+    return 0;
+}
+
 } // namespace

trunk/Source/WebCore/html/HTMLFieldSetElement.h

@@ -32 +32 @@
 public:
     static PassRefPtr<HTMLFieldSetElement> create(const QualifiedName&, Document*, HTMLFormElement*);
+    HTMLLegendElement* legend() const;
+
+protected:
+    virtual void disabledAttributeChanged() OVERRIDE;
 
 private:

trunk/Source/WebCore/html/HTMLFieldSetElement.idl

@@ -21 +21 @@
 
     interface HTMLFieldSetElement : HTMLElement {
+        attribute [Reflect] boolean disabled;
         readonly attribute HTMLFormElement form;
         attribute [Reflect] DOMString name;

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -31 +31 @@
 #include "EventNames.h"
 #include "Frame.h"
+#include "HTMLFieldSetElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
+#include "HTMLLegendElement.h"
 #include "RenderBox.h"
 #include "RenderTheme.h"
@@ -47 +49 @@
 HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
     : LabelableElement(tagName, document)
+    , m_fieldSetAncestor(0)
+    , m_legendAncestor(0)
+    , m_fieldSetAncestorValid(false)
     , m_disabled(false)
     , m_readOnly(false)
@@ -96 +101 @@
 }
 
+void HTMLFormControlElement::updateFieldSetAndLegendAncestor() const
+{
+    m_fieldSetAncestor = 0;
+    m_legendAncestor = 0;
+    for (ContainerNode* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) {
+        if (!m_legendAncestor && ancestor->hasTagName(legendTag))
+            m_legendAncestor = static_cast<HTMLLegendElement*>(ancestor);
+        if (ancestor->hasTagName(fieldsetTag)) {
+            m_fieldSetAncestor = static_cast<HTMLFieldSetElement*>(ancestor);
+            break;
+        }
+    }
+    m_fieldSetAncestorValid = true;
+}
+
 void HTMLFormControlElement::parseAttribute(Attribute* attr)
 {
@@ -103 +123 @@
         bool oldDisabled = m_disabled;
         m_disabled = !attr->isNull();
-        if (oldDisabled != m_disabled) {
-            setNeedsStyleRecalc();
-            if (renderer() && renderer()->style()->hasAppearance())
-                renderer()->theme()->stateChanged(renderer(), EnabledState);
-        }
+        if (oldDisabled != m_disabled)
+            disabledAttributeChanged();
     } else if (attr->name() == readonlyAttr) {
         bool oldReadOnly = m_readOnly;
@@ -126 +143 @@
 }
 
+void HTMLFormControlElement::disabledAttributeChanged()
+{
+    setNeedsStyleRecalc();
+    if (renderer() && renderer()->style()->hasAppearance())
+        renderer()->theme()->stateChanged(renderer(), EnabledState);
+}
+
 void HTMLFormControlElement::requiredAttributeChanged()
 {
@@ -206 +230 @@
 void HTMLFormControlElement::removedFromTree(bool deep)
 {
+    m_fieldSetAncestorValid = false;
     FormAssociatedElement::removedFromTree();
     HTMLElement::removedFromTree(deep);
@@ -253 +278 @@
     setChangedSinceLastFormControlChangeEvent(true);
     HTMLElement::dispatchInputEvent();
+}
+
+bool HTMLFormControlElement::disabled() const
+{
+    if (m_disabled)
+        return true;
+
+    if (!m_fieldSetAncestorValid)
+        updateFieldSetAndLegendAncestor();
+
+    // Form controls in the first legend element inside a fieldset are not affected by fieldset.disabled.
+    if (m_fieldSetAncestor && m_fieldSetAncestor->disabled())
+        return !(m_legendAncestor && m_legendAncestor == m_fieldSetAncestor->legend());
+    return false;
 }
 

trunk/Source/WebCore/html/HTMLFormControlElement.h

@@ -31 +31 @@
 
 class FormDataList;
+class HTMLFieldSetElement;
 class HTMLFormElement;
+class HTMLLegendElement;
 class ValidationMessage;
 class ValidityState;
@@ -50 +52 @@
     bool formNoValidate() const;
 
+    void updateFieldSetAndLegendAncestor() const;
+
     virtual void reset() { }
 
@@ -61 +65 @@
     virtual void dispatchFormControlInputEvent();
 
-    virtual bool disabled() const { return m_disabled; }
+    virtual bool disabled() const;
     void setDisabled(bool);
 
@@ -115 +119 @@
     virtual void parseAttribute(Attribute*) OVERRIDE;
     virtual void requiredAttributeChanged();
+    virtual void disabledAttributeChanged();
     virtual void attach();
     virtual void insertedIntoTree(bool deep);
@@ -148 +153 @@
     String visibleValidationMessage() const;
 
+    mutable HTMLFieldSetElement* m_fieldSetAncestor;
+    mutable HTMLLegendElement* m_legendAncestor;
     OwnPtr<ValidationMessage> m_validationMessage;
+    mutable bool m_fieldSetAncestorValid : 1;
     bool m_disabled : 1;
     bool m_readOnly : 1;