Attachment 358850 Details for Bug 193228 – Patch

[patch] Patch

193228.diff (text/plain), 12.58 KB, created by Devin Rousso on 2019-01-10 16:48:59 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-01-10 16:48:59 PST

Size: 12.58 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0b015d8fb20..6e4d9c405c1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-10  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Audit: provide a way to query for all nodes with a given computed Accessibility role
>+        https://bugs.webkit.org/show_bug.cgi?id=193228
>+        <rdar://problem/46787787>
>+
>+        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..d864103bbba
>--- /dev/null
>+++ b/LayoutTests/inspector/audit/run-accessibility-expected.txt
>@@ -0,0 +1,37 @@
>+Tests for the injected AUDIT.Accessibility functions.
>+
>+
>+
>+== Running test suite: Audit.run.Accessibility
>+-- Running test case: Audit.run.Accessibility.getElementsByComputedRole.FakeRole
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getElementsByComputedRole("FakeRole")`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getElementsByComputedRole.FakeRole.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getElementsByComputedRole("FakeRole", document.querySelector("#parent"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getElementsByComputedRole.button
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getElementsByComputedRole("button")`...
>+Result: ["#button"]
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.getElementsByComputedRole.button.parent
>+Audit setup...
>+Audit run `AUDIT.Accessibility.getElementsByComputedRole("button", document.querySelector("#parent"))`...
>+Result: []
>+Audit teardown...
>+
>+-- Running test case: Audit.run.Accessibility.InvalidCopiedFunctionCall
>+Audit setup...
>+Copying AUDIT to window...
>+Audit teardown...
>+Testing copied getElementsByComputedRole...
>+PASS: Should produce an exception.
>+Error: NotAllowedError: Unable to run outside of an Inspector Audit
>+
>diff --git a/LayoutTests/inspector/audit/run-accessibility.html b/LayoutTests/inspector/audit/run-accessibility.html
>new file mode 100644
>index 00000000000..ec3b6f64954
>--- /dev/null
>+++ b/LayoutTests/inspector/audit/run-accessibility.html
>@@ -0,0 +1,94 @@
>+<!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 false;
>+}
>+
>+function test()
>+{
>+    let suite = InspectorTest.Audit.createSuite("Audit.run.Accessibility");
>+
>+    function evaluateStringForTest(func, target, role) {
>+        if (target) {
>+            if (role)
>+                return `Accessibility.${func}("${role}", document.querySelector("#${target}"))`;
>+            return `Accessibility.${func}(document.querySelector("#${target}"))`;
>+        }
>+
>+        if (role)
>+            return `Accessibility.${func}("${role}")`;
>+    }
>+
>+    const tests = [
>+        { func: "getElementsByComputedRole", role: "FakeRole" },
>+        { func: "getElementsByComputedRole", role: "FakeRole", target: "parent" },
>+        { func: "getElementsByComputedRole", role: "button" },
>+        { func: "getElementsByComputedRole", role: "button", target: "parent" },
>+    ];
>+
>+    for (let {func, target, role} of tests) {
>+        suite.addTestCase({
>+            name: "Audit.run.Accessibility." + func + (role ? "." + role : "") + (target ? "." + target : ""),
>+            async test() {
>+                let functionString = "AUDIT." + evaluateStringForTest(func, target, role);
>+
>+                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.addTestCase({
>+        name: "Audit.run.Accessibility.InvalidCopiedFunctionCall",
>+        description: "Check that AUDIT.Accessibility functions throw an error when called outside of an audit.",
>+        async test() {
>+            let functions = new Map;
>+            for (let test of tests)
>+                functions.set(test.func, test);
>+
>+            await InspectorTest.Audit.setupAudit();
>+            InspectorTest.log(`Copying AUDIT to window...`);
>+            let {wasThrown} = await AuditAgent.run(`function() { window.AUDITCopy = AUDIT; }`);
>+            InspectorTest.assert(!wasThrown, "Should not throw an exception.");
>+            await InspectorTest.Audit.teardownAudit();
>+
>+            for (let {func, target, role} of functions.values()) {
>+                InspectorTest.log(`Testing copied ${func}...`);
>+                await InspectorTest.expectException(async function() {
>+                    await InspectorTest.evaluateInPage("window.AUDITCopy." + evaluateStringForTest(func, target, role));
>+                });
>+            }
>+        },
>+    });
>+
>+    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>
>+    <button id="button"></button>
>+    <div id="fakeRole" role="fakeRole"></div>
>+</body>
>+</html>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c05068dc003..85a45491834 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-01-10  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Audit: provide a way to query for all nodes with a given computed Accessibility role
>+        https://bugs.webkit.org/show_bug.cgi?id=193228
>+        <rdar://problem/46787787>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: inspector/audit/run-accessibility.html
>+
>+        * inspector/InspectorAuditAccessibilityUtilities.idl:
>+        * inspector/InspectorAuditAccessibilityUtilities.h:
>+        * inspector/InspectorAuditAccessibilityUtilities.cpp:
>+        (WebCore::accessiblityObjectForNode): Added.
>+        (WebCore::InspectorAuditAccessibilityUtilities::getElementsByComputedRole): Added.
>+
> 2019-01-10  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 3c84fc3b9ca..a08757d8561 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.cpp
>@@ -27,12 +27,47 @@
> #include "config.h"
> #include "InspectorAuditAccessibilityUtilities.h"
> 
>+#include "AXObjectCache.h"
>+#include "AccessibilityObject.h"
>+#include "ContainerNode.h"
>+#include "Document.h"
>+#include "ElementDescendantIterator.h"
>+#include "Node.h"
>+#include <wtf/Vector.h>
>+
> namespace WebCore {
> 
> using namespace Inspector;
> 
>-InspectorAuditAccessibilityUtilities::InspectorAuditAccessibilityUtilities()
>+#define ERROR_IF_NO_ACTIVE_AUDIT() if (!m_auditAgent.hasActiveAudit()) return Exception { NotAllowedError, "Unable to run outside of an Inspector Audit"_s };
>+
>+InspectorAuditAccessibilityUtilities::InspectorAuditAccessibilityUtilities(InspectorAuditAgent& auditAgent)
>+    : m_auditAgent(auditAgent)
> {
> }
> 
>+static AccessibilityObject* accessiblityObjectForNode(Node& node)
>+{
>+    if (!AXObjectCache::accessibilityEnabled())
>+        AXObjectCache::enableAccessibility();
>+
>+    if (AXObjectCache* axObjectCache = node.document().axObjectCache())
>+        return axObjectCache->getOrCreate(&node);
>+    return nullptr;
>+}
>+
>+ExceptionOr<Vector<Ref<Node>>> InspectorAuditAccessibilityUtilities::getElementsByComputedRole(Document& document, const String& role, Node* container)
>+{
>+    ERROR_IF_NO_ACTIVE_AUDIT();
>+
>+    Vector<Ref<Node>> nodes;
>+    for (Element& element : elementDescendants(is<ContainerNode>(container) ? downcast<ContainerNode>(*container) : document)) {
>+        if (AccessibilityObject* axObject = accessiblityObjectForNode(element)) {
>+            if (axObject->computedRoleString() == role)
>+                nodes.append(element);
>+        }
>+    }
>+    return nodes;
>+}
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>index 37c67bb1f25..2fc45d69f5a 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.h
>@@ -25,20 +25,30 @@
> 
> #pragma once
> 
>+#include "ExceptionOr.h"
>+#include <JavaScriptCore/InspectorAuditAgent.h>
>+#include <wtf/Forward.h>
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
> 
> namespace WebCore {
> 
>+class Document;
>+class Node;
>+
> class InspectorAuditAccessibilityUtilities : public RefCounted<InspectorAuditAccessibilityUtilities> {
> public:
>-    static Ref<InspectorAuditAccessibilityUtilities> create()
>+    static Ref<InspectorAuditAccessibilityUtilities> create(Inspector::InspectorAuditAgent& auditAgent)
>     {
>-        return adoptRef(*new InspectorAuditAccessibilityUtilities());
>+        return adoptRef(*new InspectorAuditAccessibilityUtilities(auditAgent));
>     }
> 
>+    ExceptionOr<Vector<Ref<Node>>> getElementsByComputedRole(Document&, const String& role, Node* container);
>+
> private:
>-    explicit InspectorAuditAccessibilityUtilities();
>+    explicit InspectorAuditAccessibilityUtilities(Inspector::InspectorAuditAgent&);
>+
>+    Inspector::InspectorAuditAgent& m_auditAgent;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>index 7ccd72bb093..9a5b51e170f 100644
>--- a/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>+++ b/Source/WebCore/inspector/InspectorAuditAccessibilityUtilities.idl
>@@ -28,4 +28,5 @@
>     JSGenerateToJSObject,
>     NoInterfaceObject,
> ] interface InspectorAuditAccessibilityUtilities {
>+    [CallWith=Document, MayThrowException] sequence<Node> getElementsByComputedRole(DOMString role, optional Node? container);
> };
>diff --git a/Source/WebCore/inspector/InspectorAuditDOMUtilities.h b/Source/WebCore/inspector/InspectorAuditDOMUtilities.h
>index 3a4af637eff..b1feb3a0be2 100644
>--- a/Source/WebCore/inspector/InspectorAuditDOMUtilities.h
>+++ b/Source/WebCore/inspector/InspectorAuditDOMUtilities.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include <JavaScriptCore/InspectorAuditAgent.h>
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
> 
>@@ -32,7 +33,7 @@ namespace WebCore {
> 
> class InspectorAuditDOMUtilities : public RefCounted<InspectorAuditDOMUtilities> {
> public:
>-    static Ref<InspectorAuditDOMUtilities> create()
>+    static Ref<InspectorAuditDOMUtilities> create(Inspector::InspectorAuditAgent&)
>     {
>         return adoptRef(*new InspectorAuditDOMUtilities());
>     }
>diff --git a/Source/WebCore/inspector/agents/page/PageAuditAgent.cpp b/Source/WebCore/inspector/agents/page/PageAuditAgent.cpp
>index dbe1d36f287..e13ba14258c 100644
>--- a/Source/WebCore/inspector/agents/page/PageAuditAgent.cpp
>+++ b/Source/WebCore/inspector/agents/page/PageAuditAgent.cpp
>@@ -82,7 +82,7 @@ Vector<std::pair<String, JSC::JSValue>> PageAuditAgent::runArguments(const int*
> 
> #define ADD_AUDIT_UTILITIES(name) \
>                 if (!m_audit##name##Utilities) \
>-                    m_audit##name##Utilities = InspectorAudit##name##Utilities::create(); \
>+                    m_audit##name##Utilities = InspectorAudit##name##Utilities::create(*this); \
>                 if (JSC::JSValue inspectorAudit##name##Utilities = toJS(execState, globalObject, *m_audit##name##Utilities)) \
>                     arguments.append(std::make_pair("" #name ""_s, WTFMove(inspectorAudit##name##Utilities)));
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193228: 358572 | 358850 | 359148