Diff
Modified: trunk/LayoutTests/ChangeLog (219074 => 219075)
--- trunk/LayoutTests/ChangeLog 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/LayoutTests/ChangeLog 2017-07-03 17:18:34 UTC (rev 219075)
@@ -1,3 +1,14 @@
+2017-07-03 Chris Fleizach <[email protected]>
+
+ AX: role="none" (or presentation) does not work on iframes
+ https://bugs.webkit.org/show_bug.cgi?id=173930
+ <rdar://problem/33034347>
+
+ Reviewed by Ryosuke Niwa.
+
+ * accessibility/presentation-role-iframe-expected.txt: Added.
+ * accessibility/presentation-role-iframe.html: Added.
+
2017-07-03 Alex Christensen <[email protected]>
Rebase test after r219024
Added: trunk/LayoutTests/accessibility/presentation-role-iframe-expected.txt (0 => 219075)
--- trunk/LayoutTests/accessibility/presentation-role-iframe-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/presentation-role-iframe-expected.txt 2017-07-03 17:18:34 UTC (rev 219075)
@@ -0,0 +1,18 @@
+
+
+
+This tests that setting role=presentation on an iframe/object hides the AXWebArea.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+1. Content child: AXRole: AXGroup
+1. Content grand child: AXRole: AXButton
+2. Content child: AXRole: AXScrollArea
+2. Content grand child: AXRole: AXWebArea
+3. Content child: AXRole: AXGroup
+3. Content grand child: AXRole: AXButton
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/accessibility/presentation-role-iframe.html (0 => 219075)
--- trunk/LayoutTests/accessibility/presentation-role-iframe.html (rev 0)
+++ trunk/LayoutTests/accessibility/presentation-role-iframe.html 2017-07-03 17:18:34 UTC (rev 219075)
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+
+<body id="body">
+
+<div id="content1" role="group">
+<iframe _onload_="runTest(1)" id="iframe1" role='presentation' src="" me</button></body>"></iframe>
+</div>
+
+<div id="content2" role="group">
+<iframe _onload_="runTest(2)" id="iframe2" src="" me</button></body>"></iframe>
+</div>
+
+<div id="content3" role="group">
+<object type="text/html" _onload_="runTest(3)" role="none" id="object1" data="" role='group'><button>Click me</button></div></body>"></object>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+description("This tests that setting role=presentation on an iframe/object hides the AXWebArea.");
+
+jsTestIsAsync = true;
+var test1Ran = false;
+var test2Ran = false;
+var test3Ran = false;
+
+// Run the test for a iframe that has presentation role and one that does not.
+// The children should be different.
+function runTest(testNumber)
+{
+ if (window.accessibilityController) {
+ var content = accessibilityController.accessibleElementById("content" + testNumber);
+ debug(testNumber + ". Content child: " + content.childAtIndex(0).role);
+ debug(testNumber + ". Content grand child: " + content.childAtIndex(0).childAtIndex(0).role);
+ if (testNumber == 1) {
+ test1Ran = true;
+ } else if (testNumber == 2) {
+ test2Ran = true;
+ } else if (testNumber == 3) {
+ test3Ran = true;
+ }
+
+ if (test3Ran && test2Ran && test1Ran) {
+ finishJSTest();
+ }
+ }
+}
+</script>
+
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (219074 => 219075)
--- trunk/Source/WebCore/ChangeLog 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/ChangeLog 2017-07-03 17:18:34 UTC (rev 219075)
@@ -1,3 +1,37 @@
+2017-07-03 Chris Fleizach <[email protected]>
+
+ AX: role="none" (or presentation) does not work on iframes
+ https://bugs.webkit.org/show_bug.cgi?id=173930
+ <rdar://problem/33034347>
+
+ Reviewed by Ryosuke Niwa.
+
+ Support setting a presentational role on an iframe so that the AXWebArea disappears from the hierarchy.
+ Accomplish this by adding children for attachment and scroll view elements the way other children are added.
+ That is, only add the non-ignored children directly (which means move the addChild logic into AccessibilityObject.)
+
+ Test: accessibility/presentation-role-iframe.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::AccessibilityNodeObject):
+ (WebCore::AccessibilityNodeObject::insertChild): Deleted.
+ (WebCore::AccessibilityNodeObject::addChild): Deleted.
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::AccessibilityObject):
+ (WebCore::AccessibilityObject::insertChild):
+ (WebCore::AccessibilityObject::addChild):
+ (WebCore::nodeHasPresentationRole):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::addChild): Deleted.
+ (WebCore::AccessibilityObject::insertChild): Deleted.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::webAreaIsPresentational):
+ (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+ (WebCore::AccessibilityRenderObject::addAttachmentChildren):
+ * accessibility/AccessibilityScrollView.cpp:
+ (WebCore::AccessibilityScrollView::addChildren):
+
2017-07-03 Matt Lewis <[email protected]>
Unreviewed, rolling out r219024.
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-07-03 17:18:34 UTC (rev 219075)
@@ -84,8 +84,6 @@
AccessibilityNodeObject::AccessibilityNodeObject(Node* node)
: AccessibilityObject()
, m_ariaRole(UnknownRole)
- , m_childrenDirty(false)
- , m_subtreeDirty(false)
, m_roleForMSAA(UnknownRole)
#ifndef NDEBUG
, m_initialized(false)
@@ -337,51 +335,6 @@
return UnknownRole;
}
-void AccessibilityNodeObject::insertChild(AccessibilityObject* child, unsigned index)
-{
- if (!child)
- return;
-
- // If the parent is asking for this child's children, then either it's the first time (and clearing is a no-op),
- // or its visibility has changed. In the latter case, this child may have a stale child cached.
- // This can prevent aria-hidden changes from working correctly. Hence, whenever a parent is getting children, ensure data is not stale.
- // Only clear the child's children when we know it's in the updating chain in order to avoid unnecessary work.
- if (child->needsToUpdateChildren() || m_subtreeDirty) {
- child->clearChildren();
- // Pass m_subtreeDirty flag down to the child so that children cache gets reset properly.
- if (m_subtreeDirty)
- child->setNeedsToUpdateSubtree();
- } else {
- // For some reason the grand children might be detached so that we need to regenerate the
- // children list of this child.
- for (const auto& grandChild : child->children(false)) {
- if (grandChild->isDetachedFromParent()) {
- child->clearChildren();
- break;
- }
- }
- }
-
- setIsIgnoredFromParentDataForChild(child);
- if (child->accessibilityIsIgnored()) {
- const auto& children = child->children();
- size_t length = children.size();
- for (size_t i = 0; i < length; ++i)
- m_children.insert(index + i, children[i]);
- } else {
- ASSERT(child->parentObject() == this);
- m_children.insert(index, child);
- }
-
- // Reset the child's m_isIgnoredFromParentData since we are done adding that child and its children.
- child->clearIsIgnoredFromParentData();
-}
-
-void AccessibilityNodeObject::addChild(AccessibilityObject* child)
-{
- insertChild(child, m_children.size());
-}
-
void AccessibilityNodeObject::addChildren()
{
// If the need to add more children in addition to existing children arises,
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2017-07-03 17:18:34 UTC (rev 219075)
@@ -145,8 +145,6 @@
explicit AccessibilityNodeObject(Node*);
AccessibilityRole m_ariaRole;
- bool m_childrenDirty;
- bool m_subtreeDirty;
mutable AccessibilityRole m_roleForMSAA;
#ifndef NDEBUG
bool m_initialized;
@@ -156,8 +154,6 @@
virtual AccessibilityRole determineAccessibilityRole();
void addChildren() override;
- void addChild(AccessibilityObject*) override;
- void insertChild(AccessibilityObject*, unsigned index) override;
bool canHaveChildren() const override;
AccessibilityRole ariaRoleAttribute() const override;
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-07-03 17:18:34 UTC (rev 219075)
@@ -88,6 +88,8 @@
, m_role(UnknownRole)
, m_lastKnownIsIgnoredValue(DefaultBehavior)
, m_isIgnoredFromParentData(AccessibilityIsIgnoredFromParentData())
+ , m_childrenDirty(false)
+ , m_subtreeDirty(false)
#if PLATFORM(GTK)
, m_wrapper(nullptr)
#endif
@@ -551,6 +553,51 @@
results.append(object);
}
+void AccessibilityObject::insertChild(AccessibilityObject* child, unsigned index)
+{
+ if (!child)
+ return;
+
+ // If the parent is asking for this child's children, then either it's the first time (and clearing is a no-op),
+ // or its visibility has changed. In the latter case, this child may have a stale child cached.
+ // This can prevent aria-hidden changes from working correctly. Hence, whenever a parent is getting children, ensure data is not stale.
+ // Only clear the child's children when we know it's in the updating chain in order to avoid unnecessary work.
+ if (child->needsToUpdateChildren() || m_subtreeDirty) {
+ child->clearChildren();
+ // Pass m_subtreeDirty flag down to the child so that children cache gets reset properly.
+ if (m_subtreeDirty)
+ child->setNeedsToUpdateSubtree();
+ } else {
+ // For some reason the grand children might be detached so that we need to regenerate the
+ // children list of this child.
+ for (const auto& grandChild : child->children(false)) {
+ if (grandChild->isDetachedFromParent()) {
+ child->clearChildren();
+ break;
+ }
+ }
+ }
+
+ setIsIgnoredFromParentDataForChild(child);
+ if (child->accessibilityIsIgnored()) {
+ const auto& children = child->children();
+ size_t length = children.size();
+ for (size_t i = 0; i < length; ++i)
+ m_children.insert(index + i, children[i]);
+ } else {
+ ASSERT(child->parentObject() == this);
+ m_children.insert(index, child);
+ }
+
+ // Reset the child's m_isIgnoredFromParentData since we are done adding that child and its children.
+ child->clearIsIgnoredFromParentData();
+}
+
+void AccessibilityObject::addChild(AccessibilityObject* child)
+{
+ insertChild(child, m_children.size());
+}
+
static void appendChildrenToArray(AccessibilityObject* object, bool isForward, AccessibilityObject* startObject, AccessibilityObject::AccessibilityChildrenVector& results)
{
// A table's children includes elements whose own children are also the table's children (due to the way the Mac exposes tables).
@@ -2335,7 +2382,7 @@
return stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_roledescriptionAttr));
}
-static bool nodeHasPresentationRole(Node* node)
+bool nodeHasPresentationRole(Node* node)
{
return nodeHasRole(node, "presentation") || nodeHasRole(node, "none");
}
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-07-03 17:18:34 UTC (rev 219075)
@@ -480,7 +480,9 @@
enum AccessibilityMathMultiscriptObjectType { PreSubscript, PreSuperscript, PostSubscript, PostSuperscript };
enum AccessibilityARIACurrentState { ARIACurrentFalse, ARIACurrentTrue, ARIACurrentPage, ARIACurrentStep, ARIACurrentLocation, ARIACurrentDate, ARIACurrentTime };
-
+
+bool nodeHasPresentationRole(Node*);
+
class AccessibilityObject : public RefCounted<AccessibilityObject> {
protected:
AccessibilityObject();
@@ -850,8 +852,8 @@
virtual void updateAccessibilityRole() { }
const AccessibilityChildrenVector& children(bool updateChildrenIfNeeded = true);
virtual void addChildren() { }
- virtual void addChild(AccessibilityObject*) { }
- virtual void insertChild(AccessibilityObject*, unsigned) { }
+ virtual void addChild(AccessibilityObject*);
+ virtual void insertChild(AccessibilityObject*, unsigned);
virtual bool shouldIgnoreAttributeRole() const { return false; }
@@ -1130,7 +1132,9 @@
AccessibilityRole m_role;
AccessibilityObjectInclusion m_lastKnownIsIgnoredValue;
AccessibilityIsIgnoredFromParentData m_isIgnoredFromParentData;
-
+ bool m_childrenDirty;
+ bool m_subtreeDirty;
+
void setIsIgnoredFromParentData(AccessibilityIsIgnoredFromParentData& data) { m_isIgnoredFromParentData = data; }
virtual bool computeAccessibilityIsIgnored() const { return true; }
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-07-03 17:18:34 UTC (rev 219075)
@@ -1151,7 +1151,18 @@
return AccessibilityObject::defaultObjectInclusion();
}
-
+
+static bool webAreaIsPresentational(RenderObject* renderer)
+{
+ if (!is<RenderView>(*renderer))
+ return false;
+
+ if (auto ownerElement = renderer->document().ownerElement())
+ return nodeHasPresentationRole(ownerElement);
+
+ return false;
+}
+
bool AccessibilityRenderObject::computeAccessibilityIsIgnored() const
{
#ifndef NDEBUG
@@ -1180,6 +1191,10 @@
if (roleValue() == PresentationalRole || inheritsPresentationalRole())
return true;
+ // WebAreas should be ignored if their iframe container is marked as presentational.
+ if (webAreaIsPresentational(m_renderer))
+ return true;
+
// An ARIA tree can only have tree items and static text as children.
if (!isAllowedChildOfTree())
return true;
@@ -3113,9 +3128,7 @@
if (!widget || !widget->isFrameView())
return;
- AccessibilityObject* axWidget = axObjectCache()->getOrCreate(widget);
- if (!axWidget->accessibilityIsIgnored())
- m_children.append(axWidget);
+ addChild(axObjectCache()->getOrCreate(widget));
}
#if PLATFORM(COCOA)
Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (219074 => 219075)
--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2017-07-03 17:17:24 UTC (rev 219074)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2017-07-03 17:18:34 UTC (rev 219075)
@@ -180,11 +180,8 @@
ASSERT(!m_haveChildren);
m_haveChildren = true;
- AccessibilityObject* webArea = webAreaObject();
- if (webArea && !webArea->accessibilityIsIgnored())
- m_children.append(webArea);
-
- updateScrollbars();
+ addChild(webAreaObject());
+ updateScrollbars();
}
AccessibilityObject* AccessibilityScrollView::webAreaObject() const
