Changeset 93565 in webkit

Timestamp:

Aug 22, 2011 5:24:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Patch by Alice Boxhall <​aboxhall@chromium.org> on 2011-08-22
Reviewed by Chris Fleizach.

aria-labelledby should be used in preference to aria-labeledby
​https://bugs.webkit.org/show_bug.cgi?id=62351

Source/WebCore:

Test: accessibility/aria-labelledby-overrides-aria-labeledby.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::ariaLabelledByElements): Renamed from ariaLabeledByElements.
(WebCore::AccessibilityRenderObject::ariaLabelledByAttribute): Renamed from ariaLabeledByAttribute,
and re-ordered to prefer the standard spelling.
(WebCore::AccessibilityRenderObject::title):
(WebCore::AccessibilityRenderObject::hasTextAlternative):

• accessibility/AccessibilityRenderObject.h:

LayoutTests:

• accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt: Added.
• accessibility/aria-labelledby-overrides-aria-labeledby.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt (added)
• LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-22  Alice Boxhall  <aboxhall@chromium.org>
+
+        Reviewed by Chris Fleizach.
+
+        aria-labelledby should be used in preference to aria-labeledby
+        https://bugs.webkit.org/show_bug.cgi?id=62351
+
+        * accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt: Added.
+        * accessibility/aria-labelledby-overrides-aria-labeledby.html: Added.
+
 2011-08-22  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-22  Alice Boxhall  <aboxhall@chromium.org>
+
+        Reviewed by Chris Fleizach.
+
+        aria-labelledby should be used in preference to aria-labeledby
+        https://bugs.webkit.org/show_bug.cgi?id=62351
+
+        Test: accessibility/aria-labelledby-overrides-aria-labeledby.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::ariaLabelledByElements): Renamed from ariaLabeledByElements.
+        (WebCore::AccessibilityRenderObject::ariaLabelledByAttribute): Renamed from ariaLabeledByAttribute,
+        and re-ordered to prefer the standard spelling.
+        (WebCore::AccessibilityRenderObject::title):
+        (WebCore::AccessibilityRenderObject::hasTextAlternative):
+        * accessibility/AccessibilityRenderObject.h:
+
 2011-08-22  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1242 +1242 @@
 }
     
-void AccessibilityRenderObject::ariaLabeledByElements(Vector<Element*>& elements) const
-{
-    elementsFromAttribute(elements, aria_labeledbyAttr);
+void AccessibilityRenderObject::ariaLabelledByElements(Vector<Element*>& elements) const
+{
+    elementsFromAttribute(elements, aria_labelledbyAttr);
     if (!elements.size())
-        elementsFromAttribute(elements, aria_labelledbyAttr);
+        elementsFromAttribute(elements, aria_labeledbyAttr);
 }
    
-String AccessibilityRenderObject::ariaLabeledByAttribute() const
+String AccessibilityRenderObject::ariaLabelledByAttribute() const
 {
     Vector<Element*> elements;
-    ariaLabeledByElements(elements);
+    ariaLabelledByElements(elements);
     
     return accessibilityDescriptionForElements(elements);
@@ -1301 +1301 @@
         return String();
     
+
     const AtomicString& title = getAttribute(titleAttr);
     if (!title.isEmpty())
@@ -1591 +1592 @@
 bool AccessibilityRenderObject::hasTextAlternative() const
 {
-    // ARIA: section 2A, bullet #3 says if aria-labeledby or aria-label appears, it should
+    // ARIA: section 2A, bullet #3 says if aria-labelledby or aria-label appears, it should
     // override the "label" element association.
-    if (!ariaLabeledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty())
+    if (!ariaLabelledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty())
         return true;
         

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -186 +186 @@
     virtual VisibleSelection selection() const;
     virtual String stringValue() const;
-    virtual String ariaLabeledByAttribute() const;
+    virtual String ariaLabelledByAttribute() const;
     virtual String title() const;
     virtual String ariaDescribedByAttribute() const;
@@ -267 +267 @@
     
     void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }
-    void ariaLabeledByElements(Vector<Element*>& elements) const;
+    void ariaLabelledByElements(Vector<Element*>& elements) const;
     bool needsToUpdateChildren() const { return m_childrenDirty; }