Changeset 152088 in webkit

Timestamp:

Jun 27, 2013 3:30:32 AM (11 years ago)

Author:

kangil.han@samsung.com

Message:

Adopt is/toHTMLLabelElement for code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=118113

Reviewed by Andreas Kling.

To enhance readability, this patch adopts is/toHTMLLabelElement.
This also helps out to reduce duplicated use of static_cast.

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::handleAttributeChanged):
(WebCore::AXObjectCache::labelChanged):

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::determineAccessibilityRole):
(WebCore::AccessibilityNodeObject::labelForElement):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::labelElementContainer):
(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):

• dom/DocumentOrderedMap.cpp:

(WebCore::keyMatchesLabelForAttribute):

• dom/Element.cpp:

(WebCore::Element::updateLabel):

• dom/TreeScope.cpp:

(WebCore::TreeScope::labelElementForId):

• html/HTMLLabelElement.h:

(WebCore::isHTMLLabelElement):
(WebCore::toHTMLLabelElement):

• html/LabelsNodeList.cpp:

(WebCore::LabelsNodeList::nodeMatches):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AXObjectCache.cpp (modified) (2 diffs)
• accessibility/AccessibilityNodeObject.cpp (modified) (2 diffs)
• accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• dom/DocumentOrderedMap.cpp (modified) (2 diffs)
• dom/Element.cpp (modified) (1 diff)
• dom/TreeScope.cpp (modified) (2 diffs)
• html/HTMLLabelElement.h (modified) (1 diff)
• html/LabelsNodeList.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Kangil Han  <kangil.han@samsung.com>
+
+        Adopt is/toHTMLLabelElement for code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=118113
+
+        Reviewed by Andreas Kling.
+
+        To enhance readability, this patch adopts is/toHTMLLabelElement.
+        This also helps out to reduce duplicated use of static_cast.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::handleAttributeChanged):
+        (WebCore::AXObjectCache::labelChanged):
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::determineAccessibilityRole):
+        (WebCore::AccessibilityNodeObject::labelForElement):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::labelElementContainer):
+        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        * dom/DocumentOrderedMap.cpp:
+        (WebCore::keyMatchesLabelForAttribute):
+        * dom/Element.cpp:
+        (WebCore::Element::updateLabel):
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::labelElementForId):
+        * html/HTMLLabelElement.h:
+        (WebCore::isHTMLLabelElement):
+        (WebCore::toHTMLLabelElement):
+        * html/LabelsNodeList.cpp:
+        (WebCore::LabelsNodeList::nodeMatches):
+
 2013-06-27  Peter Gal  <galpeter@inf.u-szeged.hu>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -810 +810 @@
     else if (attrName == altAttr || attrName == titleAttr)
         textChanged(element);
-    else if (attrName == forAttr && element->hasTagName(labelTag))
+    else if (attrName == forAttr && isHTMLLabelElement(element))
         labelChanged(element);
 
@@ -838 +838 @@
 void AXObjectCache::labelChanged(Element* element)
 {
-    ASSERT(element->hasTagName(labelTag));
-    HTMLElement* correspondingControl = static_cast<HTMLLabelElement*>(element)->control();
+    ASSERT(isHTMLLabelElement(element));
+    HTMLElement* correspondingControl = toHTMLLabelElement(element)->control();
     textChanged(correspondingControl);
 }

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -314 +314 @@
     if (node()->hasTagName(pTag))
         return ParagraphRole;
-    if (node()->hasTagName(labelTag))
+    if (isHTMLLabelElement(node()))
         return LabelRole;
     if (node()->isElementNode() && toElement(node())->isFocusable())
@@ -1101 +1101 @@
 
     for (Element* parent = element->parentElement(); parent; parent = parent->parentElement()) {
-        if (parent->hasTagName(labelTag))
-            return static_cast<HTMLLabelElement*>(parent);
+        if (isHTMLLabelElement(parent))
+            return toHTMLLabelElement(parent);
     }
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -760 +760 @@
     // find if this has a parent that is a label
     for (Node* parentNode = m_renderer->node(); parentNode; parentNode = parentNode->parentNode()) {
-        if (parentNode->hasTagName(labelTag))
-            return static_cast<HTMLLabelElement*>(parentNode);
+        if (isHTMLLabelElement(parentNode))
+            return toHTMLLabelElement(parentNode);
     }
     
@@ -1199 +1199 @@
     // don't ignore labels, because they serve as TitleUIElements
     Node* node = m_renderer->node();
-    if (node && node->hasTagName(labelTag))
+    if (node && isHTMLLabelElement(node))
         return false;
     
@@ -2549 +2549 @@
         return ParagraphRole;
 
-    if (node && node->hasTagName(labelTag))
+    if (node && isHTMLLabelElement(node))
         return LabelRole;
 

trunk/Source/WebCore/dom/DocumentOrderedMap.cpp

@@ -33 +33 @@
 
 #include "Element.h"
+#include "HTMLLabelElement.h"
 #include "HTMLMapElement.h"
 #include "HTMLNameCollection.h"
@@ -65 +66 @@
 inline bool keyMatchesLabelForAttribute(AtomicStringImpl* key, Element* element)
 {
-    return element->hasTagName(labelTag) && element->getAttribute(forAttr).impl() == key;
+    return isHTMLLabelElement(element) && element->getAttribute(forAttr).impl() == key;
 }
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2987 +2987 @@
 
     if (!oldForAttributeValue.isEmpty())
-        scope->removeLabel(oldForAttributeValue, static_cast<HTMLLabelElement*>(this));
+        scope->removeLabel(oldForAttributeValue, toHTMLLabelElement(this));
     if (!newForAttributeValue.isEmpty())
-        scope->addLabel(newForAttributeValue, static_cast<HTMLLabelElement*>(this));
+        scope->addLabel(newForAttributeValue, toHTMLLabelElement(this));
 }
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -300 +300 @@
         m_labelsByForAttribute = adoptPtr(new DocumentOrderedMap);
         for (Element* element = ElementTraversal::firstWithin(rootNode()); element; element = ElementTraversal::next(element)) {
-            if (element->hasTagName(labelTag)) {
-                HTMLLabelElement* label = static_cast<HTMLLabelElement*>(element);
+            if (isHTMLLabelElement(element)) {
+                HTMLLabelElement* label = toHTMLLabelElement(element);
                 const AtomicString& forValue = label->fastGetAttribute(forAttr);
                 if (!forValue.isEmpty())
@@ -309 +309 @@
     }
 
-    return static_cast<HTMLLabelElement*>(m_labelsByForAttribute->getElementByLabelForAttribute(forAttributeValue.impl(), this));
+    return toHTMLLabelElement(m_labelsByForAttribute->getElementByLabelForAttribute(forAttributeValue.impl(), this));
 }
 

trunk/Source/WebCore/html/HTMLLabelElement.h

@@ -56 +56 @@
 };
 
+inline bool isHTMLLabelElement(Node* node)
+{
+    return node->hasTagName(HTMLNames::labelTag);
+}
+
+inline HTMLLabelElement* toHTMLLabelElement(Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLLabelElement(node));
+    return static_cast<HTMLLabelElement*>(node);
+}
+
 } //namespace
 

trunk/Source/WebCore/html/LabelsNodeList.cpp

@@ -46 +46 @@
 bool LabelsNodeList::nodeMatches(Element* testNode) const
 {
-    return testNode->hasTagName(labelTag) && static_cast<HTMLLabelElement*>(testNode)->control() == ownerNode();
+    return isHTMLLabelElement(testNode) && toHTMLLabelElement(testNode)->control() == ownerNode();
 }