Changeset 146860 in webkit

Timestamp:

Mar 26, 2013 1:26:04 AM (11 years ago)

Author:

tkent@chromium.org

Message:

Rename HTMLInputElement::isIndeterminate to Element::shouldAppearIndeterminate
​https://bugs.webkit.org/show_bug.cgi?id=113264

Reviewed by Kentaro Hara.

HTMLInputElement had indeterminate() and isIndeterminate(). It's very
confusing.

Because indeterminate is a public DOM function and isIndeterminate is
for CSS and rendering, we rename isIndetermiante to
shouldAppearIndeterminate. Also, HTMLProgressElement, which support
:indeterminate pseudo class, should follow it. We add
shouldAppearIndeterminate to Element.

No new tests. Just a refactoring.

• dom/Element.cpp:

(WebCore::Element::shouldAppearIndeterminate): Added. Returns false.

• dom/Element.h:

(Element): Declare shouldAppearIndeterminate.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::shouldAppearIndeterminate):
Renamed from isIndeterminate.

• html/HTMLInputElement.h:

(HTMLInputElement): Rename isIndeterminate to shouldAppearIndeterminate,
and overrides Element::shouldAppearIndeterminate.

• html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::shouldAppearIndeterminate): Added.

• html/HTMLProgressElement.h: Add shouldAppearIndeterminate.

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::isIndeterminate):
Use shouldAppearIndeterminate.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne): Ditto.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::canShareStyleWithControl): Ditto.

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::isIndeterminate): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (2 diffs)
• css/StyleResolver.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (1 diff)
• html/HTMLInputElement.h (modified) (1 diff)
• html/HTMLProgressElement.cpp (modified) (1 diff)
• html/HTMLProgressElement.h (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Kent Tamura  <tkent@chromium.org>
+
+        Rename HTMLInputElement::isIndeterminate to Element::shouldAppearIndeterminate
+        https://bugs.webkit.org/show_bug.cgi?id=113264
+
+        Reviewed by Kentaro Hara.
+
+        HTMLInputElement had indeterminate() and isIndeterminate(). It's very
+        confusing.
+
+        Because indeterminate is a public DOM function and isIndeterminate is
+        for CSS and rendering, we rename isIndetermiante to
+        shouldAppearIndeterminate. Also, HTMLProgressElement, which support
+        :indeterminate pseudo class, should follow it. We add
+        shouldAppearIndeterminate to Element.
+
+        No new tests. Just a refactoring.
+
+        * dom/Element.cpp:
+        (WebCore::Element::shouldAppearIndeterminate): Added. Returns false.
+        * dom/Element.h:
+        (Element): Declare shouldAppearIndeterminate.
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::shouldAppearIndeterminate):
+        Renamed from isIndeterminate.
+        * html/HTMLInputElement.h:
+        (HTMLInputElement): Rename isIndeterminate to shouldAppearIndeterminate,
+        and overrides Element::shouldAppearIndeterminate.
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::shouldAppearIndeterminate): Added.
+        * html/HTMLProgressElement.h: Add shouldAppearIndeterminate.
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::isIndeterminate):
+        Use shouldAppearIndeterminate.
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne): Ditto.
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::canShareStyleWithControl): Ditto.
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isIndeterminate): Ditto.
+
 2013-03-26  Pan Deng  <pan.deng@intel.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -612 +612 @@
         return false;
 
-    return inputElement->isIndeterminate();
+    return inputElement->shouldAppearIndeterminate();
 }
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -645 +645 @@
                 // obey the CSS spec here in the test for matching the pseudo.
                 HTMLInputElement* inputElement = element->toInputElement();
-                if (inputElement && inputElement->shouldAppearChecked() && !inputElement->isIndeterminate())
+                if (inputElement && inputElement->shouldAppearChecked() && !inputElement->shouldAppearIndeterminate())
                     return true;
                 if (element->hasTagName(optionTag) && toHTMLOptionElement(element)->selected())
@@ -652 +652 @@
             }
         case CSSSelector::PseudoIndeterminate:
-            {
-                if (!element)
-                    break;
-#if ENABLE(PROGRESS_ELEMENT)
-                if (element->hasTagName(progressTag)) {
-                    HTMLProgressElement* progress = toHTMLProgressElement(element);
-                    if (progress && !progress->isDeterminate())
-                        return true;
-                    break;
-                }
-#endif
-                HTMLInputElement* inputElement = element->toInputElement();
-                if (inputElement && inputElement->isIndeterminate())
-                    return true;
-                break;
-            }
+            return element && element->shouldAppearIndeterminate();
         case CSSSelector::PseudoRoot:
             if (element == element->document()->documentElement())

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -544 +544 @@
     if (thisInputElement->shouldAppearChecked() != otherInputElement->shouldAppearChecked())
         return false;
-    if (thisInputElement->isIndeterminate() != otherInputElement->isIndeterminate())
+    if (thisInputElement->shouldAppearIndeterminate() != otherInputElement->shouldAppearIndeterminate())
         return false;
     if (thisInputElement->isRequired() != otherInputElement->isRequired())

trunk/Source/WebCore/dom/Element.cpp

@@ -2383 +2383 @@
 }
 
+bool Element::shouldAppearIndeterminate() const
+{
+    return false;
+}
+
 DOMTokenList* Element::classList()
 {

trunk/Source/WebCore/dom/Element.h

@@ -514 +514 @@
     virtual bool matchesReadWritePseudoClass() const;
     bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
+    virtual bool shouldAppearIndeterminate() const;
 
     DOMTokenList* classList();

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1798 +1798 @@
 }
 
-bool HTMLInputElement::isIndeterminate() const 
+bool HTMLInputElement::shouldAppearIndeterminate() const 
 {
     return m_inputType->supportsIndeterminateAppearance() && indeterminate();

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -147 +147 @@
     // 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;
+    virtual bool shouldAppearIndeterminate() const OVERRIDE;
 
     int size() const;

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -169 +169 @@
 }
 
+bool HTMLProgressElement::shouldAppearIndeterminate() const
+{
+    return !isDeterminate();
+}
+
 } // namespace
 #endif

trunk/Source/WebCore/html/HTMLProgressElement.h

@@ -54 +54 @@
 
     virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
-
+    virtual bool shouldAppearIndeterminate() const OVERRIDE;
     virtual bool supportLabels() const OVERRIDE { return true; }
 

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -781 +781 @@
         return false;
 
-    return inputElement->isIndeterminate();
+    return inputElement->shouldAppearIndeterminate();
 }