WebDriver: Add support for GetAccessibilityPropertiesForElement, GetAccessibilityPropertiesForAccessibilityNode commands

Rahim Abdi · Rahim Abdi · commit 2fe45d843b53 · 2026-07-05T19:55:33.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=299508 rdar://161303091 Reviewed by NOBODY (OOPS!). This patch implements two new WebDriver automation commands used to support more robust WPT accessibility testing: - GetAccessibilityPropertiesForElement - GetAccessibilityPropertiesForAccessibilityNode For this initial implementation, test_driver.get_accessibility_properties...() will return an accessibility property bag containing the following computed properties: - accessibilityNodeId - role - label - checked - pressed - children (array of serialized AXIDs) - parent (serialized AXID) As these new WebDriver commands are test-only interfaces, there's been in-depth discussion around how to treat computed AX properties when a property is missing and supported, or present & unsupported; see WICG/aom#203. Some additional resources: - WebDriver PR for the new commands: w3c/webdriver#1960 - ARIA PR for the initial set of computed accessibility properties, and treatment of undefined/missing/unsupported values: w3c/aria#2800. At a high level, the WebDriver client (i.e., Web Platform Tests' testdriver.js) initiates these new commands which is then dispatched to the UI Process (WebAutomationSession). The WebAutomationSession then parses the payload and extracts the protocol-specific element or accessibility node, after which it identifies the target (WebPageProxy) which invokes an asynchronous IPC message to the corresponding Web Process. Note that GetAccessibilityPropertiesForElement uses the same DOM node/frame-based approach as many other WebDriver commands however, GetAccessibilityPropertiesForAXNode does not require frame-based process routing (it retrieves computed accessibility properties using the page's axObjectCache, rather than a specific frame tied to a DOM node); thus, GetAccessibilityPropertiesForAccessibilityNode has a different message signature. Note that to fully support these new WebDriver commands, corresponding WebDriver HTTP endpoints must be implemented in Webdriver for Safari (safaridriver): - session/{session_id}/element/{elId}/accessibilityproperties: Returns accessibility properties for DOM element {elId} - session/{session_id}/accessibility/<accessibility node id>/properties/{accessibility node id}: Returns accessibility properties for accessibility node {accessibility node id} Due to the existence of two AccessibilityProperties protocol object definitions, documentation for each has been updated: - Source/WebKit/UIProcess/Automation/Automation.json — specification conformance and interoperability testing - Source/JavaScriptCore/inspector/protocol/DOM.json — Web Inspector DOM element inspection As an unrelated small fix, the return type for GetComputedLabel (WebAutomationSessionProxy IPC message) incorrectly names the first string parameter as "role" instead of "label" so this patch also corrects the tuple to return (label, errorType). * LayoutTests/resources/testdriver-vendor.js: (window.test_driver_internal.get_accessibility_properties_for_element): (window.test_driver_internal.get_accessibility_properties_for_accessibility_node): * Source/JavaScriptCore/inspector/protocol/DOM.json * Source/WebKit/UIProcess/Automation/Automation.json: * Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp: (Ref<JSON::ArrayOf<String>> buildArrayForAXChildren) (WebKit::WebAutomationSession::getAccessibilityPropertiesForElement): (WebKit::WebAutomationSession::getAccessibilityPropertiesForAccessibilityNode): * Source/WebKit/UIProcess/Automation/WebAutomationSession.h: * Source/WebKit/UIProcess/WebPageProxy.h * Source/WebKit/UIProcess/WebPageProxy.cpp: * Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp: (WebKit::WebAutomationSessionProxy::getAccessibilityPropertiesForElement): (WebKit::WebAutomationSessionProxy::getAccessibilityPropertiesForAccessibilityNode): (WebKit::WebAutomationSessionProxy::getAccessibilityObjectForAXNode) (WebAutomationSessionProxy::ComputedAXProperties getComputedAccessibilityProperties) * Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.h: * Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.messages.in: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in * Source/WebKit/Scripts/webkit/messages.py * Source/WebCore/accessibility/AXObjectCache.h
diff --git a/LayoutTests/resources/testdriver-vendor.js b/LayoutTests/resources/testdriver-vendor.js
@@ -713,6 +713,32 @@ window.test_driver_internal.get_computed_role = async function (element, context
     return context.internals.getComputedRole(element);
 }
 
+/**
+ *
+ * @param {Element} element
+ * @returns {Promise<Object>}
+ */
+window.test_driver_internal.get_accessibility_properties_for_element = async function (element, context=null) {
+    if (!element)
+        return {};
+    context = context ?? window;
+
+    return context.internals.getAccessibilityPropertiesForElement(element);
+}
+
+/**
+ *
+ * @param {string} accessibilityNodeId
+ * @returns {Promise<Object>}
+ */
+window.test_driver_internal.get_accessibility_properties_for_accessibility_node = async function (accessibilityNodeId, context=null) {
+    if (!element)
+        return {};
+    context = context ?? window;
+
+    return context.internals.getAccessibilityPropertiesForAccessibilityNode(accessibilityNodeId);
+}
+
 /**
  *
  * @param {string} origin
diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json
@@ -101,7 +101,7 @@
         },
         {
             "id": "AccessibilityProperties",
-            "description": "A structure holding accessibility properties.",
+            "description": "A structure holding accessibility properties, either forwarded to the DOM Element from its backing Accessibility Node, and/or some local properties (e.g., ignored) that may clarify other characteristics, such as why a backing Accessibility Node is not available for this DOM Element.",
             "type": "object",
             "properties": [
                 { "name": "activeDescendantNodeId", "$ref": "NodeId", "optional": true, "description": "<code>DOMNode</code> id of the accessibility object referenced by aria-activedescendant." },
diff --git a/Source/WebCore/accessibility/AXObjectCache.h b/Source/WebCore/accessibility/AXObjectCache.h
@@ -106,6 +106,16 @@ enum class AXStreamOptions : uint16_t;
 enum class AXProperty : uint16_t;
 enum class LiveRegionStatus: uint8_t;
 
+// When this is updated, WebCoreArgumentCoders.serialization.in must be updated as well.
+struct AccessibilityProperties {
+    std::optional<String> accessibilityNodeId;
+    std::optional<String> role;
+    std::optional<String> label;
+    std::optional<String> checked;
+    std::optional<String> pressed;
+    std::optional<String> parent;
+    Vector<String> children;
+};
 
 struct AXTreeData {
     String liveTree;
diff --git a/Source/WebKit/Scripts/webkit/messages.py b/Source/WebKit/Scripts/webkit/messages.py
@@ -1162,6 +1162,7 @@ def headers_for_type(type, for_implementation_file=False):
         'WallTime': ['<wtf/WallTime.h>'],
         'WebCore::AXDebugInfo': ['<WebCore/AXObjectCache.h>'],
         'WebCore::AccessibilityMode': ['<WebCore/AXObjectCache.h>'],
+        'WebCore::AccessibilityProperties': ['<WebCore/AXObjectCache.h>'],
         'WebCore::AccessibilityRemoteToken': ['<WebCore/AXObjectCache.h>'],
         'WebCore::AccessibilitySearchCriteriaIPC': ['<WebCore/AXSearchManager.h>'],
         'WebCore::AriaNotifyData': ['<WebCore/AXObjectCache.h>'],
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
@@ -4061,6 +4061,17 @@ header: <WebCore/AXObjectCache.h>
     uint64_t webProcessLocalTokenHash;
 };
 
+header: <WebCore/AXObjectCache.h>
+[CustomHeader] struct WebCore::AccessibilityProperties {
+    std::optional<String> accessibilityNodeId;
+    std::optional<String> role;
+    std::optional<String> label;
+    std::optional<String> checked;
+    std::optional<String> pressed;
+    std::optional<String> parent;
+    Vector<String> children;
+};
+
 header: <WebCore/AXObjectCache.h>
 [CustomHeader] struct WebCore::AriaNotifyData {
     String message;
diff --git a/Source/WebKit/UIProcess/Automation/Automation.json b/Source/WebKit/UIProcess/Automation/Automation.json
@@ -2,6 +2,20 @@
     "domain": "Automation",
     "description": "Automation domain exposes commands for automating user interactions with the browser.",
     "types": [
+        {
+            "id": "AccessibilityProperties",
+            "type": "object",
+            "description": "Snapshot of a DOM node's computed accessibility properties used in WebDriver contexts.",
+            "properties": [
+                { "name": "accessibilityNodeId", "type": "string" },
+                { "name": "role", "type": "string" },
+                { "name": "label", "type": "string" },
+                { "name": "checked", "type": "string" },
+                { "name": "pressed", "type": "string" },
+                { "name": "parent", "type": "string" },
+                { "name": "children", "type": "array", "items": { "type": "string" } }
+            ]
+        },
         {
             "id": "Point",
             "type": "object",
@@ -713,6 +727,32 @@
             ],
             "async": true
         },
+        {
+            "name": "getAccessibilityPropertiesForElement",
+            "description": "Get computed accessibility properties for a DOM element.",
+            "parameters": [
+                { "name": "browsingContextHandle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context." },
+                { "name": "frameHandle",  "$ref": "FrameHandle", "optional": true, "description": "The handle for the frame that contains the element. The main frame is used if this parameter is empty string or excluded." },
+                { "name": "nodeHandle", "$ref": "NodeHandle", "description": "The handle of the element to get the accessibility properties for." }
+            ],
+            "returns": [
+                { "name": "properties", "$ref": "AccessibilityProperties" }
+            ],
+            "async": true
+        },
+        {
+            "name": "getAccessibilityPropertiesForAccessibilityNode",
+            "description": "Get computed accessibility properties for an accessibility node from WebKit's accessibility tree.",
+            "parameters": [
+                { "name": "browsingContextHandle", "$ref": "BrowsingContextHandle", "description": "The handle for the browsing context." },
+                { "name": "accessibilityNodeHandle", "type": "string", "description": "The handle of the accessibility node to get the accessibility properties for." }
+            ],
+            "returns": [
+                { "name": "properties", "$ref": "AccessibilityProperties" }
+            ],
+            "async": true
+
+        },
         {
             "name": "selectOptionElement",
             "description": "Selects the given option element. In case of container with multiple options enabled, the element selectedness is toggled.",
diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp b/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp
@@ -51,6 +51,7 @@
 #include <JavaScriptCore/ConsoleTypes.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 #include <JavaScriptCore/InspectorFrontendRouter.h>
+#include <WebCore/AXObjectCache.h>
 #include <WebCore/MIMETypeRegistry.h>
 #include <WebCore/PointerEventTypeNames.h>
 #include <algorithm>
@@ -1683,6 +1684,60 @@ void WebAutomationSession::getComputedLabel(const Inspector::Protocol::Automatio
     page->sendWithAsyncReplyToProcessContainingFrameWithoutDestinationIdentifier(frameID, Messages::WebAutomationSessionProxy::GetComputedLabel(page->webPageIDInMainFrameProcess(), frameID, nodeHandle), WTF::move(completionHandler));
 }
 
+static Ref<JSON::ArrayOf<String>> buildArrayForAXChildren(Vector<String>& axChildren)
+{
+    auto childrenArray = JSON::ArrayOf<String>::create();
+
+    for (const auto& child : axChildren)
+        childrenArray->addItem(child);
+
+    return childrenArray;
+}
+
+static WTF::CompletionHandler<void(std::optional<String>, AccessibilityProperties)> makeAccessibilityPropertiesCompletionHandler(Inspector::CommandCallback<Ref<Inspector::Protocol::Automation::AccessibilityProperties>>&& callback)
+{
+    return [callback = WTF::move(callback)](std::optional<String>&& optionalError, AccessibilityProperties&& properties) mutable {
+        ASYNC_FAIL_WITH_PREDEFINED_ERROR_IF_SET(optionalError);
+        auto axProperties = Inspector::Protocol::Automation::AccessibilityProperties::create()
+            .setAccessibilityNodeId(*properties.accessibilityNodeId)
+            .setRole(*properties.role)
+            .setLabel(*properties.label)
+            .setChecked(*properties.checked)
+            .setPressed(*properties.pressed)
+            .setParent(*properties.parent)
+            .setChildren(buildArrayForAXChildren(properties.children))
+            .release();
+        callback({ WTF::move(axProperties) });
+    };
+}
+
+void WebAutomationSession::getAccessibilityPropertiesForElement(const Inspector::Protocol::Automation::BrowsingContextHandle& browsingContextHandle, const Inspector::Protocol::Automation::FrameHandle& frameHandle, const Inspector::Protocol::Automation::NodeHandle& nodeHandle, Inspector::CommandCallback<Ref<Inspector::Protocol::Automation::AccessibilityProperties>>&& callback)
+{
+    auto page = webPageProxyForHandle(browsingContextHandle);
+    ASYNC_FAIL_WITH_PREDEFINED_ERROR_IF(!page, WindowNotFound);
+
+    bool frameNotFound = false;
+    auto frameID = webFrameIDForHandle(frameHandle, frameNotFound);
+    ASYNC_FAIL_WITH_PREDEFINED_ERROR_IF(frameNotFound, FrameNotFound);
+
+    page->sendWithAsyncReplyToProcessContainingFrameWithoutDestinationIdentifier(
+        frameID,
+        Messages::WebAutomationSessionProxy::GetAccessibilityPropertiesForElement(page->webPageIDInMainFrameProcess(), frameID, nodeHandle),
+        Messages::WebAutomationSessionProxy::GetAccessibilityPropertiesForElement::Reply {
+            makeAccessibilityPropertiesCompletionHandler(WTF::move(callback))
+    });
+}
+
+void WebAutomationSession::getAccessibilityPropertiesForAccessibilityNode(const Inspector::Protocol::Automation::BrowsingContextHandle& browsingContextHandle, const String& accessibilityNodeHandle, Inspector::CommandCallback<Ref<Inspector::Protocol::Automation::AccessibilityProperties>>&& callback)
+{
+    RefPtr page = webPageProxyForHandle(browsingContextHandle);
+    ASYNC_FAIL_WITH_PREDEFINED_ERROR_IF(!page, WindowNotFound);
+
+    protect(page->legacyMainFrameProcess()).sendWithAsyncReply(
+        Messages::WebAutomationSessionProxy::GetAccessibilityPropertiesForAccessibilityNode(page->webPageIDInMainFrameProcess(), accessibilityNodeHandle),
+        makeAccessibilityPropertiesCompletionHandler(WTF::move(callback)));
+}
+
 void WebAutomationSession::selectOptionElement(const Inspector::Protocol::Automation::BrowsingContextHandle& browsingContextHandle, const Inspector::Protocol::Automation::FrameHandle& frameHandle, const Inspector::Protocol::Automation::NodeHandle& nodeHandle, CommandCallback<void>&& callback)
 {
     auto page = webPageProxyForHandle(browsingContextHandle);
diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
@@ -272,6 +272,8 @@ friend class InspectorPassthroughChannel;
     void computeElementLayout(const Inspector::Protocol::Automation::BrowsingContextHandle&, const Inspector::Protocol::Automation::FrameHandle&, const Inspector::Protocol::Automation::NodeHandle&, std::optional<bool>&& scrollIntoViewIfNeeded, Inspector::Protocol::Automation::CoordinateSystem, Inspector::CommandCallbackOf<Ref<Inspector::Protocol::Automation::Rect>, RefPtr<Inspector::Protocol::Automation::Point>, bool>&&) override;
     void getComputedRole(const Inspector::Protocol::Automation::BrowsingContextHandle&, const Inspector::Protocol::Automation::FrameHandle&, const Inspector::Protocol::Automation::NodeHandle&, Inspector::CommandCallback<String>&&) override;
     void getComputedLabel(const Inspector::Protocol::Automation::BrowsingContextHandle&, const Inspector::Protocol::Automation::FrameHandle&, const Inspector::Protocol::Automation::NodeHandle&, Inspector::CommandCallback<String>&&) override;
+    void getAccessibilityPropertiesForElement(const Inspector::Protocol::Automation::BrowsingContextHandle&, const Inspector::Protocol::Automation::FrameHandle&, const Inspector::Protocol::Automation::NodeHandle&, Inspector::CommandCallback<Ref<Inspector::Protocol::Automation::AccessibilityProperties>>&&) override;
+    void getAccessibilityPropertiesForAccessibilityNode(const Inspector::Protocol::Automation::BrowsingContextHandle&, const String& accessibilityNodeHandle, Inspector::CommandCallback<Ref<Inspector::Protocol::Automation::AccessibilityProperties>>&&) override;
     void selectOptionElement(const Inspector::Protocol::Automation::BrowsingContextHandle&, const Inspector::Protocol::Automation::FrameHandle&, const Inspector::Protocol::Automation::NodeHandle&, Inspector::CommandCallback<void>&&) override;
     Inspector::CommandResult<bool> isShowingJavaScriptDialog(const Inspector::Protocol::Automation::BrowsingContextHandle&) override;
     Inspector::CommandResult<void> dismissCurrentJavaScriptDialog(const Inspector::Protocol::Automation::BrowsingContextHandle&) override;
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -18665,6 +18665,7 @@ INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATIO
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::FocusFrame);
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::GetComputedRole);
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::GetComputedLabel);
+INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::GetAccessibilityPropertiesForElement);
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::ResolveParentFrame);
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::SelectOptionElement);
 INSTANTIATE_SEND_WITH_ASYNC_REPLY_TO_PROCESS_CONTAINING_FRAME_WITHOUT_DESTINATION_ID(WebAutomationSessionProxy::ResolveChildFrameWithName);
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -270,6 +270,7 @@ enum class AttachmentAssociatedElementType : uint8_t;
 #endif
 
 struct AXDebugInfo;
+struct AccessibilityProperties;
 struct AccessibilityRemoteToken;
 struct AccessibilitySearchCriteriaIPC;
 struct AppHighlight;
diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
@@ -47,6 +47,7 @@
 #include <JavaScriptCore/JSStringRefPrivate.h>
 #include <JavaScriptCore/OpaqueJSString.h>
 #include <JavaScriptCore/SourceTaintedOrigin.h>
+#include <WebCore/AXID.h>
 #include <WebCore/AXObjectCache.h>
 #include <WebCore/AccessibilityObject.h>
 #include <WebCore/ContainerNodeInlines.h>
@@ -76,6 +77,7 @@
 #include <WebCore/RenderElement.h>
 #include <WebCore/ScriptController.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/text/StringToIntegerConversion.h>
 #include <wtf/TZoneMallocInlines.h>
 #include <wtf/UUID.h>
 
@@ -383,6 +385,42 @@ WebCore::AccessibilityObject* WebAutomationSessionProxy::getAccessibilityObjectF
     return nullptr;
 }
 
+Expected<WebCore::AccessibilityObject*, Inspector::ErrorString> WebAutomationSessionProxy::getAccessibilityObjectForAXNode(WebCore::PageIdentifier pageID, String accessibilityNodeHandle, String& errorType)
+{
+    RefPtr page = WebProcess::singleton().webPage(pageID);
+    RefPtr frame = page ? &page->mainWebFrame() : nullptr;
+    RefPtr localFrame = frame ? frame->coreLocalFrame() : nullptr;
+    RefPtr document = localFrame ? localFrame->document() : nullptr;
+    RefPtr frameView = localFrame ? localFrame->view() : nullptr;
+
+    if (!localFrame || !localFrame->view() || !document) {
+        errorType = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::WindowNotFound);
+        return nullptr;
+    }
+
+    WebCore::AXObjectCache::enableAccessibility();
+
+    if (CheckedPtr axObjectCache = document->axObjectCache()) {
+        // Force a layout and cache update. If we don't, and this request has come in before the render tree was built,
+        // the accessibility object for this element will not be created (because it doesn't yet have its renderer).
+        axObjectCache->performDeferredCacheUpdate(ForceLayout::Yes);
+
+        auto parsedAXID = parseInteger<uint64_t>(accessibilityNodeHandle);
+        if (!parsedAXID) {
+            errorType = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(
+                Inspector::Protocol::Automation::ErrorMessage::NodeNotFound);
+            return nullptr;
+        }
+
+        auto axID = WebCore::AXID { *parsedAXID };
+        if (CheckedPtr axObject = axObjectCache->objectForID(axID))
+            return axObject;
+    }
+
+    errorType = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::InternalError);
+    return nullptr;
+}
+
 void WebAutomationSessionProxy::ensureObserverForFrame(WebFrame& frame)
 {
     // If the frame and LocalDOMWindow have become disconnected, then frame is already being destroyed
@@ -912,6 +950,75 @@ void WebAutomationSessionProxy::getComputedLabel(WebCore::PageIdentifier pageID,
     completionHandler(std::nullopt, axObject->computedLabel());
 }
 
+static WebAutomationSessionProxy::ComputedAXProperties getComputedAccessibilityProperties(WebCore::AccessibilityObject& axObject)
+{
+    String accessibilityNodeId = String::number(axObject.objectID().toUInt64());
+    String role = axObject.computedRoleString();
+    String label = axObject.computedLabel();
+
+    String checked;
+    if (axObject.supportsCheckedState())
+        checked = axObject.isChecked() ? "true"_s : "false"_s;
+
+    String pressed;
+    if (axObject.isToggleButton())
+        pressed = axObject.isPressed() ? "true"_s : "false"_s;
+
+    String parentAXID;
+    if (auto* parent = axObject.parentObject())
+        parentAXID = String::number(parent->objectID().toUInt64());
+
+    Vector<String> childrenAXIDs;
+    for (auto& child : axObject.stitchedUnignoredChildren())
+        childrenAXIDs.append(String::number(child->objectID().toUInt64()));
+
+    return { accessibilityNodeId, role, label, checked, pressed, parentAXID, WTF::move(childrenAXIDs) };
+}
+
+void WebAutomationSessionProxy::getAccessibilityPropertiesForElement(WebCore::PageIdentifier pageID, std::optional<WebCore::FrameIdentifier> frameID, String nodeHandle, CompletionHandler<void(std::optional<String>, AccessibilityProperties)>&& completionHandler)
+{
+    String errorType;
+    RefPtr axObject = getAccessibilityObjectForNode(pageID, frameID, nodeHandle, errorType);
+
+    if (!errorType.isNull()) {
+        completionHandler(errorType, AccessibilityProperties { });
+        return;
+    }
+
+    auto properties = getComputedAccessibilityProperties(*axObject);
+    completionHandler(std::nullopt, AccessibilityProperties {
+        WTF::move(properties.accessibilityNodeId),
+        WTF::move(properties.role),
+        WTF::move(properties.label),
+        WTF::move(properties.checked),
+        WTF::move(properties.pressed),
+        WTF::move(properties.parent),
+        WTF::move(properties.children)
+    });
+}
+
+void WebAutomationSessionProxy::getAccessibilityPropertiesForAccessibilityNode(WebCore::PageIdentifier pageID, String accessibilityNodeHandle, CompletionHandler<void(std::optional<String>, AccessibilityProperties)>&& completionHandler)
+{
+    String errorType;
+    auto axObjectForNode = getAccessibilityObjectForAXNode(pageID, accessibilityNodeHandle, errorType);
+    if (!axObjectForNode) {
+        completionHandler(axObjectForNode.error(), AccessibilityProperties { });
+        return;
+    }
+
+    RefPtr axObject = axObjectForNode.value();
+    auto properties = getComputedAccessibilityProperties(*axObject);
+    completionHandler(std::nullopt, AccessibilityProperties {
+        WTF::move(properties.accessibilityNodeId),
+        WTF::move(properties.role),
+        WTF::move(properties.label),
+        WTF::move(properties.checked),
+        WTF::move(properties.pressed),
+        WTF::move(properties.parent),
+        WTF::move(properties.children)
+    });
+}
+
 void WebAutomationSessionProxy::selectOptionElement(WebCore::PageIdentifier pageID, std::optional<WebCore::FrameIdentifier> frameID, String nodeHandle, CompletionHandler<void(std::optional<String>)>&& completionHandler)
 {
     RefPtr page = WebProcess::singleton().webPage(pageID);
diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.h b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.h
diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.messages.in b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.messages.in

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`},`
`102`	`102`	`{`
`103`	`103`	`"id": "AccessibilityProperties",`
`104`		`- "description": "A structure holding accessibility properties.",`
	`104`	`+ "description": "A structure holding accessibility properties, either forwarded to the DOM Element from its backing Accessibility Node, and/or some local properties (e.g., ignored) that may clarify other characteristics, such as why a backing Accessibility Node is not available for this DOM Element.",`
`105`	`105`	`"type": "object",`
`106`	`106`	`"properties": [`
`107`	`107`	`{ "name": "activeDescendantNodeId", "$ref": "NodeId", "optional": true, "description": "<code>DOMNode</code> id of the accessibility object referenced by aria-activedescendant." },`