Changeset 239986 in webkit

Timestamp:

Jan 15, 2019, 8:28:37 AM (8 years ago)

Author:

Devin Rousso

Message:

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 Joseph Pecoraro.

Source/WebCore:

Test: inspector/audit/run-accessibility.html

• inspector/InspectorAuditAccessibilityObject.idl:
• inspector/InspectorAuditAccessibilityObject.h:
• inspector/InspectorAuditAccessibilityObject.cpp:

(WebCore::accessiblityObjectForNode): Added.
(WebCore::InspectorAuditAccessibilityObject::getElementsByComputedRole): Added.

LayoutTests:

• inspector/audit/run-accessibility.html: Added.
• inspector/audit/run-accessibility-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/audit/run-accessibility-expected.txt (added)
• LayoutTests/inspector/audit/run-accessibility.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorAuditAccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorAuditAccessibilityObject.h (modified) (2 diffs)
• Source/WebCore/inspector/InspectorAuditAccessibilityObject.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-01-15  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 Joseph Pecoraro.
+
+        * inspector/audit/run-accessibility.html: Added.
+        * inspector/audit/run-accessibility-expected.txt: Added.
+
 2019-01-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-15  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 Joseph Pecoraro.
+
+        Test: inspector/audit/run-accessibility.html
+
+        * inspector/InspectorAuditAccessibilityObject.idl:
+        * inspector/InspectorAuditAccessibilityObject.h:
+        * inspector/InspectorAuditAccessibilityObject.cpp:
+        (WebCore::accessiblityObjectForNode): Added.
+        (WebCore::InspectorAuditAccessibilityObject::getElementsByComputedRole): Added.
+
 2019-01-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/inspector/InspectorAuditAccessibilityObject.cpp

@@ -28 +28 @@
 #include "InspectorAuditAccessibilityObject.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;
 
-InspectorAuditAccessibilityObject::InspectorAuditAccessibilityObject()
+#define ERROR_IF_NO_ACTIVE_AUDIT() \
+    if (!m_auditAgent.hasActiveAudit()) \
+        return Exception { NotAllowedError, "Cannot be called outside of a Web Inspector Audit"_s };
+
+InspectorAuditAccessibilityObject::InspectorAuditAccessibilityObject(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>>> InspectorAuditAccessibilityObject::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

trunk/Source/WebCore/inspector/InspectorAuditAccessibilityObject.h

@@ -26 +26 @@
 #pragma once
 
+#include "ExceptionOr.h"
 #include <JavaScriptCore/InspectorAuditAgent.h>
+#include <wtf/Forward.h>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
@@ -32 +34 @@
 namespace WebCore {
 
+class Document;
+class Node;
+
 class InspectorAuditAccessibilityObject : public RefCounted<InspectorAuditAccessibilityObject> {
 public:
-    static Ref<InspectorAuditAccessibilityObject> create(Inspector::InspectorAuditAgent&)
+    static Ref<InspectorAuditAccessibilityObject> create(Inspector::InspectorAuditAgent& auditAgent)
     {
-        return adoptRef(*new InspectorAuditAccessibilityObject());
+        return adoptRef(*new InspectorAuditAccessibilityObject(auditAgent));
     }
 
+    ExceptionOr<Vector<Ref<Node>>> getElementsByComputedRole(Document&, const String& role, Node* container);
+
 private:
-    explicit InspectorAuditAccessibilityObject();
+    explicit InspectorAuditAccessibilityObject(Inspector::InspectorAuditAgent&);
+
+    Inspector::InspectorAuditAgent& m_auditAgent;
 };
 

trunk/Source/WebCore/inspector/InspectorAuditAccessibilityObject.idl

@@ -29 +29 @@
     NoInterfaceObject,
 ] interface InspectorAuditAccessibilityObject {
+    [CallWith=Document, MayThrowException] sequence<Node> getElementsByComputedRole(DOMString role, optional Node? container);
 };