LayoutTests:

        - Test for <rdar://problem/4469419>
        REGRESSION: RadioButtons are not checked in Safari when name attribute comes after checked attribute

        * fast/forms/radio-attr-order-expected.checksum: Added.
        * fast/forms/radio-attr-order-expected.png: Added.
        * fast/forms/radio-attr-order-expected.txt: Added.
        * fast/forms/radio-attr-order.html: Added.

WebCore:

        Reviewed by Tim Hatcher.

        - fix for <rdar://problem/4469419>
        REGRESSION: RadioButtons are not checked in Safari when name attribute comes after checked attribute

        Test: fast/forms/radio-attr-order.html

        * khtml/html/HTMLInputElementImpl.cpp: (WebCore::HTMLInputElementImpl::parseMappedAttribute):
        When the name attribute gets parsed for radio buttons, if its supposed to be checked by default, call setChecked.
        Also, when the name changes on a checked button, we don't need to check that
        there's a form before removing it as the checked button for that group.
        That was an old check from when we required a form to keep track of checked buttons.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13250 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 669878bd071873b0913f535be5718ddf74d06157..ed273d131ab9dd65883f0a69ac8f1d8ad6174089 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-10  Adele Peterson  <adele@apple.com>
+
+        - Test for <rdar://problem/4469419> 
+        REGRESSION: RadioButtons are not checked in Safari when name attribute comes after checked attribute
+
+        * fast/forms/radio-attr-order-expected.checksum: Added.
+        * fast/forms/radio-attr-order-expected.png: Added.
+        * fast/forms/radio-attr-order-expected.txt: Added.
+        * fast/forms/radio-attr-order.html: Added.
+
 2006-03-09  Adele Peterson  <adele@apple.com>
 
         - Test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7675

diff --git a/LayoutTests/fast/forms/radio-attr-order-expected.checksum b/LayoutTests/fast/forms/radio-attr-order-expected.checksum
new file mode 100644 (file)
index 0000000..21d01d1
--- /dev/null
+++ b/LayoutTests/fast/forms/radio-attr-order-expected.checksum
@@ -0,0 +1 @@
+71625a7fff7b02cd27bf1a356be520b8
\ No newline at end of file

diff --git a/LayoutTests/fast/forms/radio-attr-order-expected.png b/LayoutTests/fast/forms/radio-attr-order-expected.png
new file mode 100644 (file)
index 0000000..f3b340a
Binary files /dev/null and b/LayoutTests/fast/forms/radio-attr-order-expected.png differ

diff --git a/LayoutTests/fast/forms/radio-attr-order-expected.txt b/LayoutTests/fast/forms/radio-attr-order-expected.txt
new file mode 100644 (file)
index 0000000..f8e4c94
--- /dev/null
+++ b/LayoutTests/fast/forms/radio-attr-order-expected.txt
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock (anonymous) at (0,0) size 784x73
+        RenderText {TEXT} at (0,0) size 744x18
+          text run at (0,0) width 744: "This tests that radio buttons are checked by default, even when the name attribute is parsed after the checked attribute. "
+        RenderBR {BR} at (0,0) size 0x0
+        RenderBR {BR} at (0,18) size 0x18
+        RenderBlock {INPUT} at (3,39) size 12x13
+        RenderText {TEXT} at (18,36) size 300x18
+          text run at (18,36) width 300: "This radio button should be checked by default "
+        RenderBR {BR} at (0,0) size 0x0
+        RenderBR {BR} at (0,55) size 0x18
+      RenderBlock {DIV} at (0,73) size 784x18
+        RenderText {TEXT} at (0,0) size 301x18
+          text run at (0,0) width 82: "Test Passed. "
+          text run at (82,0) width 219: "Radio button is checked by default"

diff --git a/LayoutTests/fast/forms/radio-attr-order.html b/LayoutTests/fast/forms/radio-attr-order.html
new file mode 100644 (file)
index 0000000..3118498
--- /dev/null
+++ b/LayoutTests/fast/forms/radio-attr-order.html
@@ -0,0 +1,17 @@
+<html>
+    <head>
+        <script>
+            function test() {
+                if (document.getElementById("rb").checked)
+                    document.getElementById("result").innerHTML = "Test Passed.  Radio button is checked by default";
+            }
+        </script>
+    </head>
+<body onload="test()">
+This tests that radio buttons are checked by default, even when the name attribute is parsed after the checked attribute.
+<br><br>
+<input type="radio" checked name="test_group" id="rb">This radio button should be checked by default
+<br><br>
+<div id="result">Test Failed.  Radio button is not checked by default.</div>
+</body>
+</html>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c100d3588d5e612b2929caf28df8c6f0f1bc107c..40d09f54e44eb001b9678becfc0e7ca59b34b667 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2006-03-10  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - fix for <rdar://problem/4469419> 
+        REGRESSION: RadioButtons are not checked in Safari when name attribute comes after checked attribute
+
+        Test: fast/forms/radio-attr-order.html
+
+        * khtml/html/HTMLInputElementImpl.cpp: (WebCore::HTMLInputElementImpl::parseMappedAttribute):
+        When the name attribute gets parsed for radio buttons, if its supposed to be checked by default, call setChecked.
+        Also, when the name changes on a checked button, we don't need to check that 
+        there's a form before removing it as the checked button for that group.  
+        That was an old check from when we required a form to keep track of checked buttons.
+
 2006-03-10  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by darin.

diff --git a/WebCore/khtml/html/HTMLInputElementImpl.cpp b/WebCore/khtml/html/HTMLInputElementImpl.cpp
index cec6bc44ec7545bb705615a688e685d0f157c707..4e4b769aafd758243aa56631ba24b031738ac19f 100644 (file)
--- a/WebCore/khtml/html/HTMLInputElementImpl.cpp
+++ b/WebCore/khtml/html/HTMLInputElementImpl.cpp
@@ -509,7 +509,7 @@ bool HTMLInputElementImpl::mapToEntry(const QualifiedName& attrName, MappedAttri
 void HTMLInputElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
 {
     if (attr->name() == nameAttr) {
-        if (m_type == RADIO && checked() && m_form) {
+        if (m_type == RADIO && checked()) {
             // Remove the radio from its old group.
             if (m_type == RADIO && !m_name.isEmpty())
                 getDocument()->removeRadioButtonGroup(m_name.impl(), m_form);
@@ -518,9 +518,16 @@ void HTMLInputElementImpl::parseMappedAttribute(MappedAttributeImpl *attr)
         // Update our cached reference to the name.
         m_name = attr->value();
         
-        // Add it to its new group.
-        if (m_type == RADIO && checked())
-            getDocument()->radioButtonChecked(this, m_form);
+        if (m_type == RADIO) {
+            // In case we parsed the checked attribute first, call setChecked if the element is checked by default.
+            if (m_useDefaultChecked)
+                setChecked(m_defaultChecked);
+            // Add the button to its new group.
+            if (checked())
+                getDocument()->radioButtonChecked(this, m_form);
+        }
+        
+        
     } else if (attr->name() == autocompleteAttr) {
         m_autocomplete = !equalIgnoringCase(attr->value(), "off");
     } else if (attr->name() ==  typeAttr) {