[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
cfleizach at apple.com
cfleizach at apple.com
Fri Jan 21 15:03:36 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 603b034cbb1240a01b87d0e456eff0205692e9e2
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 6 20:39:27 2011 +0000
AX: "AXExpanded" not exposed on most ARIA roles that use aria-expanded
https://bugs.webkit.org/show_bug.cgi?id=51995
Reviewed by Beth Dakin.
WebCore:
Test: platform/mac/accessibility/aria-expanded-standard-items.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::supportsARIAExpanded):
(WebCore::AccessibilityObject::isExpanded):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::isVisited):
* accessibility/AccessibilityRenderObject.h:
* accessibility/mac/AccessibilityObjectWrapper.mm:
(-[AccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
LayoutTests:
* platform/mac/accessibility/aria-expanded-standard-items-expected.txt: Added.
* platform/mac/accessibility/aria-expanded-standard-items.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75179 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index da2019a..e86e59c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-06 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ AX: "AXExpanded" not exposed on most ARIA roles that use aria-expanded
+ https://bugs.webkit.org/show_bug.cgi?id=51995
+
+ * platform/mac/accessibility/aria-expanded-standard-items-expected.txt: Added.
+ * platform/mac/accessibility/aria-expanded-standard-items.html: Added.
+
2011-01-06 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items-expected.txt b/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items-expected.txt
new file mode 100644
index 0000000..42d763d
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items-expected.txt
@@ -0,0 +1,16 @@
+foo
+bar
+This tests that ARIA expanded will be exposed on arbitrary elements.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS accessibilityController.focusedElement.role is 'AXRole: AXButton'
+PASS accessibilityController.focusedElement.isExpanded is true
+PASS accessibilityController.focusedElement.isExpanded is true
+PASS accessibilityController.focusedElement.childAtIndex(0).isExpanded is false
+PASS accessibilityController.focusedElement.childAtIndex(0).role is 'AXRole: AXStaticText'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items.html b/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items.html
new file mode 100644
index 0000000..ff7b692
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-expanded-standard-items.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div tabindex="0" id="button" role="button" aria-expanded="true">foo</div>
+<div tabindex="0" id="heading" role="heading" aria-expanded="true">bar</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that ARIA expanded will be exposed on arbitrary elements.");
+
+ if (window.accessibilityController) {
+
+ document.getElementById("button").focus();
+ shouldBe("accessibilityController.focusedElement.role", "'AXRole: AXButton'");
+ shouldBe("accessibilityController.focusedElement.isExpanded", "true");
+
+ document.getElementById("heading").focus();
+ shouldBe("accessibilityController.focusedElement.isExpanded", "true");
+
+ shouldBe("accessibilityController.focusedElement.childAtIndex(0).isExpanded", "false");
+ shouldBe("accessibilityController.focusedElement.childAtIndex(0).role", "'AXRole: AXStaticText'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index da9f6a4..1aa76a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-06 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ AX: "AXExpanded" not exposed on most ARIA roles that use aria-expanded
+ https://bugs.webkit.org/show_bug.cgi?id=51995
+
+ Test: platform/mac/accessibility/aria-expanded-standard-items.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::supportsARIAExpanded):
+ (WebCore::AccessibilityObject::isExpanded):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::isVisited):
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/mac/AccessibilityObjectWrapper.mm:
+ (-[AccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+
2010-12-28 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebCore/accessibility/AccessibilityObject.cpp b/WebCore/accessibility/AccessibilityObject.cpp
index cf49245..511bd3f 100644
--- a/WebCore/accessibility/AccessibilityObject.cpp
+++ b/WebCore/accessibility/AccessibilityObject.cpp
@@ -1041,6 +1041,19 @@ AccessibilityObject* AccessibilityObject::focusedUIElement() const
return AXObjectCache::focusedUIElementForPage(page);
}
+bool AccessibilityObject::supportsARIAExpanded() const
+{
+ return !getAttribute(aria_expandedAttr).isEmpty();
+}
+
+bool AccessibilityObject::isExpanded() const
+{
+ if (equalIgnoringCase(getAttribute(aria_expandedAttr), "true"))
+ return true;
+
+ return false;
+}
+
AccessibilityButtonState AccessibilityObject::checkboxOrRadioValue() const
{
// If this is a real checkbox or radio button, AccessibilityRenderObject will handle.
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index a1f2417..45b54fc 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -327,7 +327,7 @@ public:
virtual bool isVisited() const { return false; }
virtual bool isRequired() const { return false; }
virtual bool isLinked() const { return false; }
- virtual bool isExpanded() const { return false; }
+ virtual bool isExpanded() const;
virtual bool isVisible() const { return true; }
virtual bool isCollapsed() const { return false; }
virtual void setIsExpanded(bool) { }
@@ -366,7 +366,8 @@ public:
virtual bool ariaHasPopup() const { return false; }
bool ariaIsMultiline() const;
virtual const AtomicString& invalidStatus() const;
-
+ bool supportsARIAExpanded() const;
+
// ARIA drag and drop
virtual bool supportsARIADropping() const { return false; }
virtual bool supportsARIADragging() const { return false; }
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index b81a83f..7dc6840 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2054,14 +2054,6 @@ bool AccessibilityRenderObject::isVisited() const
// FIXME: Is it a privacy violation to expose visited information to accessibility APIs?
return m_renderer->style()->isLink() && m_renderer->style()->insideLink() == InsideVisitedLink;
}
-
-bool AccessibilityRenderObject::isExpanded() const
-{
- if (equalIgnoringCase(getAttribute(aria_expandedAttr), "true"))
- return true;
-
- return false;
-}
void AccessibilityRenderObject::setElementAttributeValue(const QualifiedName& attributeName, bool value)
{
diff --git a/WebCore/accessibility/AccessibilityRenderObject.h b/WebCore/accessibility/AccessibilityRenderObject.h
index ff7dbfc..3a29fe9 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.h
+++ b/WebCore/accessibility/AccessibilityRenderObject.h
@@ -101,7 +101,6 @@ public:
virtual bool isVisited() const;
virtual bool isRequired() const;
virtual bool isLinked() const;
- virtual bool isExpanded() const;
virtual void setIsExpanded(bool);
virtual bool canSetFocusAttribute() const;
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index fa9cb86..f3b388b 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -645,6 +645,9 @@ static WebCoreTextMarkerRange* textMarkerRangeFromVisiblePositions(AXObjectCache
if (m_object->supportsARIAOwns())
[additional addObject:NSAccessibilityOwnsAttribute];
+ if (m_object->supportsARIAExpanded())
+ [additional addObject:NSAccessibilityExpandedAttribute];
+
if (m_object->isScrollbar())
[additional addObject:NSAccessibilityOrientationAttribute];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list