AX: Clean up AccessibilityRenderObject

https://bugs.webkit.org/show_bug.cgi?id=127838

Reviewed by Chris Fleizach.

Reducing some code by implementing ariaElementsFromAttribute.
It is used as a helper for other methods.

No new tests. Covered by existing ones.

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::ariaElementsFromAttribute):
(WebCore::AccessibilityRenderObject::ariaFlowToElements):
(WebCore::AccessibilityRenderObject::ariaDescribedByElements):
(WebCore::AccessibilityRenderObject::ariaOwnsElements):
* accessibility/AccessibilityRenderObject.h:


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

Author: [email protected]

Source/WebCore/ChangeLog

@@ -1,3 +1,22 @@
+2014-01-30  Krzysztof Czech  <[email protected]>
+
+        AX: Clean up AccessibilityRenderObject
+        https://bugs.webkit.org/show_bug.cgi?id=127838
+
+        Reviewed by Chris Fleizach.
+
+        Reducing some code by implementing ariaElementsFromAttribute.
+        It is used as a helper for other methods.
+
+        No new tests. Covered by existing ones.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::ariaElementsFromAttribute):
+        (WebCore::AccessibilityRenderObject::ariaFlowToElements):
+        (WebCore::AccessibilityRenderObject::ariaDescribedByElements):
+        (WebCore::AccessibilityRenderObject::ariaOwnsElements):
+        * accessibility/AccessibilityRenderObject.h:
+
 2014-01-29  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r163048.

Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1010,23 +1010,25 @@ bool AccessibilityRenderObject::ariaHasPopup() const
     return elementAttributeValue(aria_haspopupAttr);
 }
 
+void AccessibilityRenderObject::ariaElementsFromAttribute(AccessibilityChildrenVector& children, const QualifiedName& attributeName) const
+{
+    Vector<Element*> elements;
+    elementsFromAttribute(elements, attributeName);
+    AXObjectCache* cache = axObjectCache();
+    for (const auto& element : elements) {
+        if (AccessibilityObject* axObject = cache->getOrCreate(element))
+            children.append(axObject);
+    }
+}
+
 bool AccessibilityRenderObject::supportsARIAFlowTo() const
 {
     return !getAttribute(aria_flowtoAttr).isEmpty();
 }
 
 void AccessibilityRenderObject::ariaFlowToElements(AccessibilityChildrenVector& flowTo) const
 {
-    Vector<Element*> elements;
-    elementsFromAttribute(elements, aria_flowtoAttr);
-    
-    AXObjectCache* cache = axObjectCache();
-    for (const auto& element : elements) {
-        AccessibilityObject* flowToElement = cache->getOrCreate(element);
-        if (flowToElement)
-            flowTo.append(flowToElement);
-    }
-        
+    ariaElementsFromAttribute(flowTo, aria_flowtoAttr);
 }
 
 bool AccessibilityRenderObject::supportsARIADescribedBy() const
@@ -1036,14 +1038,7 @@ bool AccessibilityRenderObject::supportsARIADescribedBy() const
 
 void AccessibilityRenderObject::ariaDescribedByElements(AccessibilityChildrenVector& ariaDescribedBy) const
 {
-    Vector<Element*> elements;
-    elementsFromAttribute(elements, aria_describedbyAttr);
-
-    AXObjectCache* cache = axObjectCache();
-    for (const auto& element : elements) {
-        if (AccessibilityObject* describedByElement = cache->getOrCreate(element))
-            ariaDescribedBy.append(describedByElement);
-    }
+    ariaElementsFromAttribute(ariaDescribedBy, aria_describedbyAttr);
 }
 
 bool AccessibilityRenderObject::supportsARIADropping() const 
@@ -1687,15 +1682,7 @@ void AccessibilityRenderObject::setValue(const String& string)
 
 void AccessibilityRenderObject::ariaOwnsElements(AccessibilityChildrenVector& axObjects) const
 {
-    Vector<Element*> elements;
-    elementsFromAttribute(elements, aria_ownsAttr);
-    
-    for (const auto& element : elements) {
-        RenderObject* render = element->renderer();
-        AccessibilityObject* obj = axObjectCache()->getOrCreate(render);
-        if (obj)
-            axObjects.append(obj);
-    }
+    ariaElementsFromAttribute(axObjects, aria_ownsAttr);
 }
 
 bool AccessibilityRenderObject::supportsARIAOwns() const

Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -225,6 +225,7 @@ class AccessibilityRenderObject : public AccessibilityNodeObject {
     virtual bool computeAccessibilityIsIgnored() const override;
 
 private:
+    void ariaElementsFromAttribute(AccessibilityChildrenVector&, const QualifiedName&) const;
     void ariaListboxSelectedChildren(AccessibilityChildrenVector&);
     void ariaListboxVisibleChildren(AccessibilityChildrenVector&);
     bool isAllowedChildOfTree() const;