Attachment 358568 Details for Bug 193225 – Patch

[patch] Patch

193225.diff (text/plain), 15.57 KB, created by Devin Rousso on 2019-01-07 19:54:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-01-07 19:54:18 PST

Size: 15.57 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 50a6f484396..f2c565da2c1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-07  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Audit: provide a way to get related Accessibility nodes for a given node
>+        https://bugs.webkit.org/show_bug.cgi?id=193225
>+        <rdar://problem/46799956>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/audit/run-accessibility.html: Added.
>+        * inspector/audit/run-accessibility-expected.txt: Added.
>+
> 2019-01-06  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Audit: create new IDL type for exposing special functionality in test context
>diff --git a/LayoutTests/inspector/audit/run-accessibility-expected.txt b/LayoutTests/inspector/audit/run-accessibility-expected.txt
>new file mode 100644
>index 00000000000..6f42869d8d3
>--- /dev/null
>+++ b/LayoutTests/inspector/audit/run-accessibility-expected.txt
>@@ -0,0 +1,100 @@
>+Tests for the injected AUDIT.Accessibility functions.
>+
>+
>+== Running test suite: Audit.run.Accessibility
>+-- Running test case: Audit.run.Accessibility.getActiveDescendant.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getActiveDescendant(document.querySelector("#parent"))`...
>+Result: #child
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getActiveDescendant.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getActiveDescendant(document.querySelector("#child"))`...
>+Result: null
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getChildNodes.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getChildNodes(document.querySelector("#parent"))`...
>+Result: ["#child"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getChildNodes.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getChildNodes(document.querySelector("#child"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getControlledNodes.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getControlledNodes(document.querySelector("#parent"))`...
>+Result: ["#child"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getControlledNodes.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getControlledNodes(document.querySelector("#child"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getFlowedNodes.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getFlowedNodes(document.querySelector("#parent"))`...
>+Result: ["#child"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getFlowedNodes.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getFlowedNodes(document.querySelector("#child"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getMouseEventNode.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getMouseEventNode(document.querySelector("#parent"))`...
>+Result: #parent
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getMouseEventNode.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getMouseEventNode(document.querySelector("#child"))`...
>+Result: #parent
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getOwnedNodes.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getOwnedNodes(document.querySelector("#parent"))`...
>+Result: ["#child"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getOwnedNodes.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getOwnedNodes(document.querySelector("#child"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getParentNode.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getParentNode(document.querySelector("#parent"))`...
>+Result: null
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getParentNode.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getParentNode(document.querySelector("#child"))`...
>+Result: #parent
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getSelectedChildNodes.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getSelectedChildNodes(document.querySelector("#parent"))`...
>+Result: ["#child"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getSelectedChildNodes.child
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getSelectedChildNodes(document.querySelector("#child"))`...
>+Result: []
>+Audit teardown...
>+
>diff --git a/LayoutTests/inspector/audit/run-accessibility.html b/LayoutTests/inspector/audit/run-accessibility.html
>new file mode 100644
>index 00000000000..ea6abcc7972
>--- /dev/null
>+++ b/LayoutTests/inspector/audit/run-accessibility.html
>@@ -0,0 +1,70 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
>+<script src="resources/audit-utilities.js"></script>
>+<script>
>+
>+function stringify(result) {
>+    if (result instanceof Element)
>+        return "#" + result.id;
>+    if (Array.isArray(result))
>+        return JSON.stringify(result.map(stringify));
>+    return null;
>+}
>+
>+function test()
>+{
>+    let suite = InspectorTest.Audit.createSuite("Audit.run.Accessibility");
>+
>+    const tests = [
>+        { func: "getActiveDescendant", target: "parent" },
>+        { func: "getActiveDescendant", target: "child" },
>+        { func: "getChildNodes", target: "parent" },
>+        { func: "getChildNodes", target: "child" },
>+        { func: "getControlledNodes", target: "parent" },
>+        { func: "getControlledNodes", target: "child" },
>+        { func: "getFlowedNodes", target: "parent" },
>+        { func: "getFlowedNodes", target: "child" },
>+        { func: "getMouseEventNode", target: "parent" },
>+        { func: "getMouseEventNode", target: "child" },
>+        { func: "getOwnedNodes", target: "parent" },
>+        { func: "getOwnedNodes", target: "child" },
>+        { func: "getParentNode", target: "parent" },
>+        { func: "getParentNode", target: "child" },
>+        { func: "getSelectedChildNodes", target: "parent" },
>+        { func: "getSelectedChildNodes", target: "child" },
>+    ];
>+
>+    for (let {func, target} of tests) {
>+        suite.addTestCase({
>+            name: "Audit.run.Accessibility." + func + "." + target,
>+            async test() {
>+                let functionString = `AUDIT.Accessibility.${func}(document.querySelector("#${target}"))`;
>+
>+                await InspectorTest.Audit.setupAudit();
>+
>+                InspectorTest.log(`Audit run \`${functionString}\`...`);
>+                let {result, wasThrown} = await AuditAgent.run(`function() { return stringify(${functionString}); }`);
>+                InspectorTest.assert(!wasThrown, "Should not throw an exception.");
>+                if (!wasThrown)
>+                    InspectorTest.log("Result: " + result.value);
>+                else
>+                    InspectorTest.log(result.description);
>+
>+                await InspectorTest.Audit.teardownAudit();
>+            },
>+        });
>+    }
>+
>+    suite.runTestCasesAndFinish();
>+}
>+</script>
>+</head>
>+<body onload="runTest()">
>+    <p>Tests for the injected AUDIT.Accessibility functions.</p>
>+    <ul id="parent" role="tree" aria-activedescendant="child" aria-controls="child" aria-flowto="child" aria-owns="child" onclick="void(0);">
>+        <li id="child" role="treeitem" aria-selected="true"></li>
>+    </ul>
>+</body>
>+</html>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4fd67da18d9..1cb10abe177 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2019-01-07  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Audit: provide a way to get related Accessibility nodes for a given node
>+        https://bugs.webkit.org/show_bug.cgi?id=193225
>+        <rdar://problem/46799956>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: inspector/audit/run-accessibility.html
>+
>+        * inspector/InspectorAuditAccessibilityUtilities.idl:
>+        * inspector/InspectorAuditAccessibilityUtilities.h:
>+        * inspector/InspectorAuditAccessibilityUtilities.cpp:
>+        (WebCore::accessiblityObjectForNode): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getActiveDescendant): Added.
>+        (WebCore::addChildren): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getChildNodes): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getControlledNodes): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getFlowedNodes): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getMouseEventNode): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getOwnedNodes): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getParentNode): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getSelectedChildNodes): Added.
>+
> 2019-01-06  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Audit: create new IDL type for exposing special functionality in test context
>diff --git a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp
>index 0e4ebf85693..74761524ba8 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp
>@@ -27,10 +27,126 @@
> #include "config.h"
> #include "InspectorAuditAccessibilityUtilities.h"
> 
>+#include "AXObjectCache.h"
>+#include "AccessibilityNodeObject.h"
>+#include "AccessibilityObject.h"
>+#include "Document.h"
>+#include "Element.h"
>+#include "HTMLNames.h"
>+#include "Node.h"
>+#include <wtf/Vector.h>
>+
> namespace WebCore {
> 
> InspectorAuditAccessibilityUtilities::InspectorAuditAccessibilityUtilities()
> {
> }
> 
>+static AccessibilityObject* accessiblityObjectForNode(Node& node)
>+{
>+    if (!AXObjectCache::accessibilityEnabled())
>+        AXObjectCache::enableAccessibility();
>+
>+    if (AXObjectCache* axObjectCache = node.document().axObjectCache())
>+        return axObjectCache->getOrCreate(&node);
>+    return nullptr;
>+}
>+
>+RefPtr<Node> InspectorAuditAccessibilityUtilities::getActiveDescendant(Node& node)
>+{
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        if (AccessibilityObject* activeDescendant = axObject->activeDescendant())
>+            return activeDescendant->node();
>+    }
>+    return nullptr;
>+}
>+
>+static void addChildren(AccessibilityObject& parentObject, Vector<Ref<Node>>& childNodes) {
>+    for (const RefPtr<AccessibilityObject>& childObject : parentObject.children()) {
>+        if (Node* childNode = childObject->node())
>+            childNodes.append(*childNode);
>+        else
>+            addChildren(*childObject, childNodes);
>+    }
>+}
>+
>+Vector<Ref<Node>> InspectorAuditAccessibilityUtilities::getChildNodes(Node& node)
>+{
>+    Vector<Ref<Node>> childNodes;
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node))
>+        addChildren(*axObject, childNodes);
>+    return childNodes;
>+}
>+
>+
>+Vector<Ref<Node>> InspectorAuditAccessibilityUtilities::getControlledNodes(Node& node)
>+{
>+    Vector<Ref<Node>> controlledNodes;
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        Vector<Element*> controlledElements;
>+        axObject->elementsFromAttribute(controlledElements, HTMLNames::aria_controlsAttr);
>+        for (Element* controlledElement : controlledElements)
>+            controlledNodes.append(*controlledElement);
>+    }
>+    return controlledNodes;
>+}
>+
>+Vector<Ref<Node>> InspectorAuditAccessibilityUtilities::getFlowedNodes(Node& node)
>+{
>+    Vector<Ref<Node>> flowedNodes;
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        Vector<Element*> flowedElements;
>+        axObject->elementsFromAttribute(flowedElements, HTMLNames::aria_flowtoAttr);
>+        for (Element* flowedElement : flowedElements)
>+            flowedNodes.append(*flowedElement);
>+    }
>+    return flowedNodes;
>+}
>+
>+RefPtr<Node> InspectorAuditAccessibilityUtilities::getMouseEventNode(Node& node)
>+{
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        if (is<AccessibilityNodeObject>(axObject))
>+            return downcast<AccessibilityNodeObject>(axObject)->mouseButtonListener(MouseButtonListenerResultFilter::IncludeBodyElement);
>+    }
>+    return nullptr;
>+}
>+
>+Vector<Ref<Node>> InspectorAuditAccessibilityUtilities::getOwnedNodes(Node& node)
>+{
>+    Vector<Ref<Node>> ownedNodes;
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        if (axObject->supportsARIAOwns()) {
>+            Vector<Element*> ownedElements;
>+            axObject->elementsFromAttribute(ownedElements, HTMLNames::aria_ownsAttr);
>+            for (Element* ownedElement : ownedElements)
>+                ownedNodes.append(*ownedElement);
>+        }
>+    }
>+    return ownedNodes;
>+}
>+
>+RefPtr<Node> InspectorAuditAccessibilityUtilities::getParentNode(Node& node)
>+{
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        if (AccessibilityObject* parentObject = axObject->parentObjectUnignored())
>+            return parentObject->node();
>+    }
>+    return nullptr;
>+}
>+
>+Vector<Ref<Node>> InspectorAuditAccessibilityUtilities::getSelectedChildNodes(Node& node)
>+{
>+    Vector<Ref<Node>> selectedChildNodes;
>+    if (AccessibilityObject* axObject = accessiblityObjectForNode(node)) {
>+        AccessibilityObject::AccessibilityChildrenVector selectedChildren;
>+        axObject->selectedChildren(selectedChildren);
>+        for (RefPtr<AccessibilityObject>& selectedChildObject : selectedChildren) {
>+            if (Node* selectedChildNode = selectedChildObject->node())
>+                selectedChildNodes.append(*selectedChildNode);
>+        }
>+    }
>+    return selectedChildNodes;
>+}
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>index a770a8087a4..a13c4b9d565 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>@@ -25,11 +25,14 @@
> 
> #pragma once
> 
>+#include <wtf/Forward.h>
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
> 
> namespace WebCore {
> 
>+class Node;
>+
> class InspectorAuditAccessibilityUtilities : public RefCounted<InspectorAuditAccessibilityUtilities> {
> public:
>     static Ref<InspectorAuditAccessibilityUtilities> create()
>@@ -37,6 +40,15 @@ public:
>         return adoptRef(*new InspectorAuditAccessibilityUtilities());
>     }
> 
>+    RefPtr<Node> getActiveDescendant(Node&);
>+    Vector<Ref<Node>> getChildNodes(Node&);
>+    Vector<Ref<Node>> getControlledNodes(Node&);
>+    Vector<Ref<Node>> getFlowedNodes(Node&);
>+    RefPtr<Node> getMouseEventNode(Node&);
>+    Vector<Ref<Node>> getOwnedNodes(Node&);
>+    RefPtr<Node> getParentNode(Node&);
>+    Vector<Ref<Node>> getSelectedChildNodes(Node&);
>+
> private:
>     InspectorAuditAccessibilityUtilities();
> };
>diff --git a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>index 7ccd72bb093..3b342a10fe8 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>@@ -28,4 +28,12 @@
>     JSGenerateToJSObject,
>     NoInterfaceObject,
> ] interface InspectorAuditAccessibilityUtilities {
>+    Node? getActiveDescendant(Node node);
>+    sequence<Node> getChildNodes(Node node);
>+    sequence<Node> getControlledNodes(Node node);
>+    sequence<Node> getFlowedNodes(Node node);
>+    Node? getMouseEventNode(Node node);
>+    sequence<Node> getOwnedNodes(Node node);
>+    Node? getParentNode(Node node);
>+    sequence<Node> getSelectedChildNodes(Node node);
> };

Flags:

hi: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 193225: 358565 | 358568 | 358848 | 358858 | 359174 | 359175 | 359182 | 359183 | 359188 | 359232 | 359237 | 359240 | 359244 | 359562 | 359567 | 359572 | 359581 | 359596 | 359601 | 359602 | 359604 | 359749