Diff
Modified: trunk/LayoutTests/ChangeLog (93577 => 93578)
--- trunk/LayoutTests/ChangeLog 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/LayoutTests/ChangeLog 2011-08-23 03:55:42 UTC (rev 93578)
@@ -1,3 +1,14 @@
+2011-08-22 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r93565.
+ http://trac.webkit.org/changeset/93565
+ https://bugs.webkit.org/show_bug.cgi?id=66745
+
+ Breaks layout tests (Requested by koz2 on #webkit).
+
+ * accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt: Removed.
+ * accessibility/aria-labelledby-overrides-aria-labeledby.html: Removed.
+
2011-08-22 Peter Kasting <[email protected]>
[chromium] Mark some tests on Mac as flakily crashing.
Deleted: trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt (93577 => 93578)
--- trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt 2011-08-23 03:55:42 UTC (rev 93578)
@@ -1,12 +0,0 @@
-Alpha Beta Gamma Delta Epsilon
-This tests that if aria-labelledby is used, then non-standard aria-labeledby attributes are ignored.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS obj.title is "AXTitle: Gamma"
-PASS obj.title is "AXTitle: Epsilon"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html (93577 => 93578)
--- trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html 2011-08-23 03:55:42 UTC (rev 93578)
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href=""
-<script>
-var successfullyParsed = false;
-</script>
-<script src=""
-</head>
-<body id="body">
-
-<button aria-labelledby="gamma" aria-labeledby="delta">Alpha</button>
-<button aria-labeledby="epsilon">Beta</button>
-<span id="gamma">Gamma</span>
-<span id="delta">Delta</span>
-<span id="epsilon">Epsilon</span>
-
-<p id="description"></p>
-<ul id="console"></ul>
-
-<script>
- description("This tests that if aria-labelledby is used, then non-standard aria-labeledby attributes are ignored.");
-
- function log(str) {
- var console = document.getElementById("console");
- var li = document.createElement("li");
- li.appendChild(document.createTextNode(str));
- console.appendChild(li);
- }
-
- function logAXObject(obj) {
- log("for " + obj.allAttributes());
- log("children:\n" + obj.attributesOfChildren());
- log("obj.title is " + obj.title);
- log("obj.description is " + obj.description);
- }
- if (window.accessibilityController) {
- var body = document.getElementById("body");
- body.focus();
- var groupObj = accessibilityController.focusedElement.childAtIndex(0);
- var obj = groupObj.childAtIndex(0);
- // Title from aria-labelledby element, aria-labeledby is ignored
- shouldBe("obj.title", '"AXTitle: Gamma"');
- var obj = groupObj.childAtIndex(1);
- // aria-labeledby is used if no aria-labelledby present
- shouldBe("obj.title", '"AXTitle: Epsilon"');
- }
-
- successfullyParsed = true;
-</script>
-
-<script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (93577 => 93578)
--- trunk/Source/WebCore/ChangeLog 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/Source/WebCore/ChangeLog 2011-08-23 03:55:42 UTC (rev 93578)
@@ -1,3 +1,18 @@
+2011-08-22 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r93565.
+ http://trac.webkit.org/changeset/93565
+ https://bugs.webkit.org/show_bug.cgi?id=66745
+
+ Breaks layout tests (Requested by koz2 on #webkit).
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::ariaLabeledByElements):
+ (WebCore::AccessibilityRenderObject::ariaLabeledByAttribute):
+ (WebCore::AccessibilityRenderObject::title):
+ (WebCore::AccessibilityRenderObject::hasTextAlternative):
+ * accessibility/AccessibilityRenderObject.h:
+
2011-08-22 Alice Boxhall <[email protected]>
Range::setEnd(const Position&, ExceptionCode) calls setStart() instead of setEnd()
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (93577 => 93578)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-08-23 03:55:42 UTC (rev 93578)
@@ -1241,17 +1241,17 @@
}
}
-void AccessibilityRenderObject::ariaLabelledByElements(Vector<Element*>& elements) const
+void AccessibilityRenderObject::ariaLabeledByElements(Vector<Element*>& elements) const
{
- elementsFromAttribute(elements, aria_labelledbyAttr);
+ elementsFromAttribute(elements, aria_labeledbyAttr);
if (!elements.size())
- elementsFromAttribute(elements, aria_labeledbyAttr);
+ elementsFromAttribute(elements, aria_labelledbyAttr);
}
-String AccessibilityRenderObject::ariaLabelledByAttribute() const
+String AccessibilityRenderObject::ariaLabeledByAttribute() const
{
Vector<Element*> elements;
- ariaLabelledByElements(elements);
+ ariaLabeledByElements(elements);
return accessibilityDescriptionForElements(elements);
}
@@ -1300,7 +1300,6 @@
if (!node)
return String();
-
const AtomicString& title = getAttribute(titleAttr);
if (!title.isEmpty())
return title;
@@ -1591,9 +1590,9 @@
bool AccessibilityRenderObject::hasTextAlternative() const
{
- // ARIA: section 2A, bullet #3 says if aria-labelledby or aria-label appears, it should
+ // ARIA: section 2A, bullet #3 says if aria-labeledby or aria-label appears, it should
// override the "label" element association.
- if (!ariaLabelledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty())
+ if (!ariaLabeledByAttribute().isEmpty() || !getAttribute(aria_labelAttr).isEmpty())
return true;
return false;
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (93577 => 93578)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-08-23 02:53:26 UTC (rev 93577)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-08-23 03:55:42 UTC (rev 93578)
@@ -185,7 +185,7 @@
virtual PlainTextRange selectedTextRange() const;
virtual VisibleSelection selection() const;
virtual String stringValue() const;
- virtual String ariaLabelledByAttribute() const;
+ virtual String ariaLabeledByAttribute() const;
virtual String title() const;
virtual String ariaDescribedByAttribute() const;
virtual String accessibilityDescription() const;
@@ -266,7 +266,7 @@
mutable bool m_childrenDirty;
void setRenderObject(RenderObject* renderer) { m_renderer = renderer; }
- void ariaLabelledByElements(Vector<Element*>& elements) const;
+ void ariaLabeledByElements(Vector<Element*>& elements) const;
bool needsToUpdateChildren() const { return m_childrenDirty; }
virtual bool isDetached() const { return !m_renderer; }
