Changeset 93578 in webkit
- Timestamp:
- Aug 22, 2011 8:55:42 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r93570 r93578 1 2011-08-22 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r93565. 4 http://trac.webkit.org/changeset/93565 5 https://bugs.webkit.org/show_bug.cgi?id=66745 6 7 Breaks layout tests (Requested by koz2 on #webkit). 8 9 * accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt: Removed. 10 * accessibility/aria-labelledby-overrides-aria-labeledby.html: Removed. 11 1 12 2011-08-22 Peter Kasting <pkasting@google.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r93574 r93578 1 2011-08-22 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r93565. 4 http://trac.webkit.org/changeset/93565 5 https://bugs.webkit.org/show_bug.cgi?id=66745 6 7 Breaks layout tests (Requested by koz2 on #webkit). 8 9 * accessibility/AccessibilityRenderObject.cpp: 10 (WebCore::AccessibilityRenderObject::ariaLabeledByElements): 11 (WebCore::AccessibilityRenderObject::ariaLabeledByAttribute): 12 (WebCore::AccessibilityRenderObject::title): 13 (WebCore::AccessibilityRenderObject::hasTextAlternative): 14 * accessibility/AccessibilityRenderObject.h: 15 1 16 2011-08-22 Alice Boxhall <aboxhall@chromium.org> 2 17 -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r93565 r93578 1242 1242 } 1243 1243 1244 void AccessibilityRenderObject::ariaLabel ledByElements(Vector<Element*>& elements) const1245 { 1246 elementsFromAttribute(elements, aria_label ledbyAttr);1244 void AccessibilityRenderObject::ariaLabeledByElements(Vector<Element*>& elements) const 1245 { 1246 elementsFromAttribute(elements, aria_labeledbyAttr); 1247 1247 if (!elements.size()) 1248 elementsFromAttribute(elements, aria_label edbyAttr);1248 elementsFromAttribute(elements, aria_labelledbyAttr); 1249 1249 } 1250 1250 1251 String AccessibilityRenderObject::ariaLabel ledByAttribute() const1251 String AccessibilityRenderObject::ariaLabeledByAttribute() const 1252 1252 { 1253 1253 Vector<Element*> elements; 1254 ariaLabel ledByElements(elements);1254 ariaLabeledByElements(elements); 1255 1255 1256 1256 return accessibilityDescriptionForElements(elements); … … 1301 1301 return String(); 1302 1302 1303 1304 1303 const AtomicString& title = getAttribute(titleAttr); 1305 1304 if (!title.isEmpty()) … … 1592 1591 bool AccessibilityRenderObject::hasTextAlternative() const 1593 1592 { 1594 // ARIA: section 2A, bullet #3 says if aria-label ledby or aria-label appears, it should1593 // ARIA: section 2A, bullet #3 says if aria-labeledby or aria-label appears, it should 1595 1594 // override the "label" element association. 1596 if (!ariaLabel ledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty())1595 if (!ariaLabeledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty()) 1597 1596 return true; 1598 1597 -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h
r93565 r93578 186 186 virtual VisibleSelection selection() const; 187 187 virtual String stringValue() const; 188 virtual String ariaLabel ledByAttribute() const;188 virtual String ariaLabeledByAttribute() const; 189 189 virtual String title() const; 190 190 virtual String ariaDescribedByAttribute() const; … … 267 267 268 268 void setRenderObject(RenderObject* renderer) { m_renderer = renderer; } 269 void ariaLabel ledByElements(Vector<Element*>& elements) const;269 void ariaLabeledByElements(Vector<Element*>& elements) const; 270 270 bool needsToUpdateChildren() const { return m_childrenDirty; } 271 271
Note: See TracChangeset
for help on using the changeset viewer.