Changeset 106792 in webkit

Timestamp:

Feb 6, 2012 2:18:57 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=76995.
WebKit fails IETC :indeterminate and input type=radio test.

All input types should respect indeterminate property(getter and setter). This is true with other browsers.
Indeterminate appearance for radio input type is supported by IOS platform. Webkit need not support indeterminate appearance
for radio input type on other platforms.

Patch by Joe Thomas <​joethomas@motorola.com> on 2012-02-06
Reviewed by Kent Tamura.

Source/WebCore:

Test: fast/forms/indeterminate-input-types.html

• html/CheckboxInputType.cpp:

(WebCore::CheckboxInputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
(WebCore):

• html/CheckboxInputType.h:

(CheckboxInputType):

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::setIndeterminate): Removed the check isCheckable().
(WebCore::HTMLInputElement::isIndeterminate): Checks indeterminate appearance is supported.
(WebCore):

• html/HTMLInputElement.h:

(HTMLInputElement):

• html/InputType.cpp:

(WebCore::InputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
(WebCore):

• html/InputType.h:

(InputType):

• html/RadioInputType.cpp:

(WebCore::RadioInputType::willDispatchClick): Indeterminate related code is moved to IOS specific.
(WebCore::RadioInputType::didDispatchClick): Ditto.
(WebCore::RadioInputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
(WebCore):

• html/RadioInputType.h:

(RadioInputType):

LayoutTests:

• fast/forms/indeterminate-input-types-expected.txt: Added.
• fast/forms/indeterminate-input-types.html: Added.
• fast/forms/indeterminate-radio.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/indeterminate-input-types-expected.txt (added)
• LayoutTests/fast/forms/indeterminate-input-types.html (added)
• LayoutTests/fast/forms/indeterminate-radio.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/CheckboxInputType.cpp (modified) (1 diff)
• Source/WebCore/html/CheckboxInputType.h (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)
• Source/WebCore/html/InputType.cpp (modified) (1 diff)
• Source/WebCore/html/InputType.h (modified) (1 diff)
• Source/WebCore/html/RadioInputType.cpp (modified) (3 diffs)
• Source/WebCore/html/RadioInputType.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  Joe Thomas  <joethomas@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=76995.
+        WebKit fails IETC :indeterminate and input type=radio test.
+
+        All input types should respect indeterminate property(getter and setter). This is true with other browsers.
+        Indeterminate appearance for radio input type is supported by IOS platform. Webkit need not support indeterminate appearance
+        for radio input type on other platforms.
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/indeterminate-input-types-expected.txt: Added.
+        * fast/forms/indeterminate-input-types.html: Added.
+        * fast/forms/indeterminate-radio.html:
+
 2012-02-06  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/fast/forms/indeterminate-radio.html

@@ -6 +6 @@
     div
     {
-        color: red;
+        color: green;
     }
     input:indeterminate + #test
     {
-        color: green;
+        color: red;
     }
 </style>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Joe Thomas  <joethomas@motorola.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=76995.
+        WebKit fails IETC :indeterminate and input type=radio test.
+
+        All input types should respect indeterminate property(getter and setter). This is true with other browsers.
+        Indeterminate appearance for radio input type is supported by IOS platform. Webkit need not support indeterminate appearance
+        for radio input type on other platforms.
+
+        Reviewed by Kent Tamura.
+
+        Test: fast/forms/indeterminate-input-types.html
+
+        * html/CheckboxInputType.cpp:
+        (WebCore::CheckboxInputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
+        (WebCore):
+        * html/CheckboxInputType.h:
+        (CheckboxInputType):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setIndeterminate): Removed the check isCheckable().
+        (WebCore::HTMLInputElement::isIndeterminate): Checks indeterminate appearance is supported.
+        (WebCore):
+        * html/HTMLInputElement.h:
+        (HTMLInputElement):
+        * html/InputType.cpp:
+        (WebCore::InputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
+        (WebCore):
+        * html/InputType.h:
+        (InputType):
+        * html/RadioInputType.cpp:
+        (WebCore::RadioInputType::willDispatchClick): Indeterminate related code is moved to IOS specific.
+        (WebCore::RadioInputType::didDispatchClick): Ditto.
+        (WebCore::RadioInputType::supportsIndeterminateAppearance): Checks indeterminate appearance is supported.
+        (WebCore):
+        * html/RadioInputType.h:
+        (RadioInputType):
+
 2012-02-06  Robin Cao  <robin.cao@torchmobile.com.cn>
 

trunk/Source/WebCore/html/CheckboxInputType.cpp

@@ -102 +102 @@
 }
 
+bool CheckboxInputType::supportsIndeterminateAppearance() const
+{
+    return true;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/CheckboxInputType.h

@@ -49 +49 @@
     virtual void didDispatchClick(Event*, const ClickHandlingState&) OVERRIDE;
     virtual bool isCheckbox() const OVERRIDE;
+    virtual bool supportsIndeterminateAppearance() const OVERRIDE;
 };
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -935 +935 @@
 void HTMLInputElement::setIndeterminate(bool newValue)
 {
-    if (!m_inputType->isCheckable() || indeterminate() == newValue)
+    if (indeterminate() == newValue)
         return;
 
@@ -1818 +1818 @@
 }
 
+bool HTMLInputElement::isIndeterminate() const 
+{
+    return m_inputType->supportsIndeterminateAppearance() && indeterminate();
+}
+
 } // namespace

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -129 +129 @@
     // shouldAppearChecked is used by the rendering tree/CSS while checked() is used by JS to determine checked state
     bool shouldAppearChecked() const;
-    virtual bool isIndeterminate() const { return indeterminate(); }
+    virtual bool isIndeterminate() const;
 
     int size() const;

trunk/Source/WebCore/html/InputType.cpp

@@ -732 +732 @@
 }
 
+bool InputType::supportsIndeterminateAppearance() const
+{
+    return false;
+}
+
 namespace InputTypeNames {
 

trunk/Source/WebCore/html/InputType.h

@@ -264 +264 @@
     virtual String serialize(double) const;
 
+    virtual bool supportsIndeterminateAppearance() const;
+
 protected:
     InputType(HTMLInputElement* element) : m_element(element) { }

trunk/Source/WebCore/html/RadioInputType.cpp

@@ -153 +153 @@
 
     state->checked = element()->checked();
+    state->checkedRadioButton = element()->checkedRadioButtons().checkedButtonForGroup(element()->name());
+
+#if PLATFORM(IOS)
     state->indeterminate = element()->indeterminate();
-    state->checkedRadioButton = element()->checkedRadioButtons().checkedButtonForGroup(element()->name());
 
     if (element()->indeterminate())
         element()->setIndeterminate(false);
+#endif
+
     element()->setChecked(true, true);
 
@@ -175 +179 @@
             checkedRadioButton->setChecked(true);
         }
+
+#if PLATFORM(IOS)        
         element()->setIndeterminate(state.indeterminate);
+#endif
+
     }
 
@@ -187 +195 @@
 }
 
+bool RadioInputType::supportsIndeterminateAppearance() const
+{
+#if PLATFORM(IOS)
+    return true;
+#else
+    return false;
+#endif
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/RadioInputType.h

@@ -53 +53 @@
     virtual void didDispatchClick(Event*, const ClickHandlingState&) OVERRIDE;
     virtual bool isRadioButton() const OVERRIDE;
+    virtual bool supportsIndeterminateAppearance() const OVERRIDE;
 };