Changeset 286056 in webkit

Timestamp:

Nov 19, 2021, 6:30:34 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][a11y] Add implementation of action interface when building with ATSPI
​https://bugs.webkit.org/show_bug.cgi?id=232749

Reviewed by Adrian Perez de Castro.

Source/WebCore:

• SourcesGTK.txt:
• accessibility/atspi/AccessibilityObjectActionAtspi.cpp: Added.

(WebCore::AccessibilityObjectAtspi::actionName const):
(WebCore::AccessibilityObjectAtspi::localizedActionName const):
(WebCore::AccessibilityObjectAtspi::actionKeyBinding const):
(WebCore::AccessibilityObjectAtspi::doAction const):

• accessibility/atspi/AccessibilityObjectAtspi.cpp:

(WebCore::AccessibilityObjectAtspi::interfacesForObject):
(WebCore::AccessibilityObjectAtspi::path):
(WebCore::AccessibilityObjectAtspi::buildInterfaces const):

• accessibility/atspi/AccessibilityObjectAtspi.h:

Tools:

Add a unit test for the action interface and WTR implementation.

• TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:

(testActionBasic):
(beforeAll):

• WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp:

(WTR::AccessibilityUIElement::isPressActionSupported):
(WTR::AccessibilityUIElement::press):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/SourcesGTK.txt (modified) (1 diff)
• Source/WebCore/accessibility/atspi/AccessibilityObjectActionAtspi.cpp (added)
• Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][a11y] Add implementation of action interface when building with ATSPI
+        https://bugs.webkit.org/show_bug.cgi?id=232749
+
+        Reviewed by Adrian Perez de Castro.
+
+        * SourcesGTK.txt:
+        * accessibility/atspi/AccessibilityObjectActionAtspi.cpp: Added.
+        (WebCore::AccessibilityObjectAtspi::actionName const):
+        (WebCore::AccessibilityObjectAtspi::localizedActionName const):
+        (WebCore::AccessibilityObjectAtspi::actionKeyBinding const):
+        (WebCore::AccessibilityObjectAtspi::doAction const):
+        * accessibility/atspi/AccessibilityObjectAtspi.cpp:
+        (WebCore::AccessibilityObjectAtspi::interfacesForObject):
+        (WebCore::AccessibilityObjectAtspi::path):
+        (WebCore::AccessibilityObjectAtspi::buildInterfaces const):
+        * accessibility/atspi/AccessibilityObjectAtspi.h:
+
 2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/SourcesGTK.txt

@@ -42 +42 @@
 accessibility/atspi/AccessibilityAtspi.cpp
 accessibility/atspi/AccessibilityObjectAtspi.cpp
+accessibility/atspi/AccessibilityObjectActionAtspi.cpp
 accessibility/atspi/AccessibilityObjectComponentAtspi.cpp
 accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp

trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp

@@ -61 +61 @@
 OptionSet<AccessibilityObjectAtspi::Interface> AccessibilityObjectAtspi::interfacesForObject(AXCoreObject& coreObject)
 {
-    OptionSet<Interface> interfaces = { Interface::Accessible, Interface::Component };
+    OptionSet<Interface> interfaces = { Interface::Accessible, Interface::Component, Interface::Action };
 
     RenderObject* renderer = coreObject.isAccessibilityRenderObject() ? coreObject.renderer() : nullptr;
@@ -484 +484 @@
         if (m_interfaces.contains(Interface::Hypertext))
             interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_hypertext_interface), &s_hypertextFunctions });
+        if (m_interfaces.contains(Interface::Action))
+            interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_action_interface), &s_actionFunctions });
         m_path = atspiRoot->atspi().registerObject(*this, WTFMove(interfaces));
     }
@@ -1116 +1118 @@
     if (m_interfaces.contains(Interface::Hypertext))
         g_variant_builder_add(builder, "s", webkit_hypertext_interface.name);
+    if (m_interfaces.contains(Interface::Action))
+        g_variant_builder_add(builder, "s", webkit_action_interface.name);
 }
 

trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h

@@ -49 +49 @@
         Value = 1 << 3,
         Hyperlink = 1 << 4,
-        Hypertext = 1 << 5
+        Hypertext = 1 << 5,
+        Action = 1 << 6
     };
     const OptionSet<Interface>& interfaces() const { return m_interfaces; }
@@ -123 +124 @@
     WEBCORE_EXPORT URL url() const;
 
+    WEBCORE_EXPORT String actionName() const;
+    WEBCORE_EXPORT bool doAction() const;
+
 private:
     explicit AccessibilityObjectAtspi(AXCoreObject*);
@@ -162 +166 @@
     std::optional<unsigned> hyperlinkIndex(unsigned) const;
 
+    String localizedActionName() const;
+    String actionKeyBinding() const;
+
     static OptionSet<Interface> interfacesForObject(AXCoreObject&);
 
@@ -170 +177 @@
     static GDBusInterfaceVTable s_hyperlinkFunctions;
     static GDBusInterfaceVTable s_hypertextFunctions;
+    static GDBusInterfaceVTable s_actionFunctions;
 
     AXCoreObject* m_axObject { nullptr };

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][a11y] Add implementation of action interface when building with ATSPI
+        https://bugs.webkit.org/show_bug.cgi?id=232749
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add a unit test for the action interface and WTR implementation.
+
+        * TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:
+        (testActionBasic):
+        (beforeAll):
+        * WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp:
+        (WTR::AccessibilityUIElement::isPressActionSupported):
+        (WTR::AccessibilityUIElement::press):
+
 2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp

@@ -1885 +1885 @@
 }
 
+static void testActionBasic(AccessibilityTest* test, gconstpointer)
+{
+    test->showInWindow(800, 600);
+    test->loadHtml(
+        "<html>"
+        "  <body>"
+        "    <p>This is <button accessKey='p'>button</button> and <a href='https://www.webkitgtk.org'>link</a> in a paragraph</p>"
+        "  </body>"
+        "</html>",
+        nullptr);
+    test->waitUntilLoadFinished();
+
+    auto testApp = test->findTestApplication();
+    g_assert_true(ATSPI_IS_ACCESSIBLE(testApp.get()));
+
+    auto documentWeb = test->findDocumentWeb(testApp.get());
+    g_assert_true(ATSPI_IS_ACCESSIBLE(documentWeb.get()));
+    g_assert_cmpint(atspi_accessible_get_child_count(documentWeb.get(), nullptr), ==, 1);
+
+    auto p = adoptGRef(atspi_accessible_get_child_at_index(documentWeb.get(), 0, nullptr));
+    g_assert_true(ATSPI_IS_ACTION(p.get()));
+    // Paragraph implements action interface, but it does nothing.
+    g_assert_cmpint(atspi_action_get_n_actions(ATSPI_ACTION(p.get()), nullptr), ==, 1);
+    GUniquePtr<char> name(atspi_action_get_action_name(ATSPI_ACTION(p.get()), 0, nullptr));
+    g_assert_cmpstr(name.get(), ==, "");
+    GUniquePtr<char> localizedName(atspi_action_get_localized_name(ATSPI_ACTION(p.get()), 0, nullptr));
+    g_assert_cmpstr(localizedName.get(), ==, "");
+    GUniquePtr<char> keyBinding(atspi_action_get_key_binding(ATSPI_ACTION(p.get()), 0, nullptr));
+    g_assert_cmpstr(keyBinding.get(), ==, "");
+
+    auto button = adoptGRef(atspi_accessible_get_child_at_index(p.get(), 0, nullptr));
+    g_assert_true(ATSPI_IS_ACTION(button.get()));
+    g_assert_cmpint(atspi_action_get_n_actions(ATSPI_ACTION(button.get()), nullptr), ==, 1);
+    name.reset(atspi_action_get_action_name(ATSPI_ACTION(button.get()), 0, nullptr));
+    g_assert_cmpstr(name.get(), ==, "press");
+#if USE(ATSPI)
+    localizedName.reset(atspi_action_get_localized_name(ATSPI_ACTION(button.get()), 0, nullptr));
+    g_assert_cmpstr(localizedName.get(), ==, "press");
+#endif
+    keyBinding.reset(atspi_action_get_key_binding(ATSPI_ACTION(button.get()), 0, nullptr));
+    g_assert_cmpstr(keyBinding.get(), ==, "p");
+
+    auto a = adoptGRef(atspi_accessible_get_child_at_index(p.get(), 1, nullptr));
+    g_assert_true(ATSPI_IS_ACTION(a.get()));
+    g_assert_cmpint(atspi_action_get_n_actions(ATSPI_ACTION(a.get()), nullptr), ==, 1);
+    name.reset(atspi_action_get_action_name(ATSPI_ACTION(a.get()), 0, nullptr));
+    g_assert_cmpstr(name.get(), ==, "jump");
+#if USE(ATSPI)
+    localizedName.reset(atspi_action_get_localized_name(ATSPI_ACTION(a.get()), 0, nullptr));
+    g_assert_cmpstr(localizedName.get(), ==, "jump");
+#endif
+    keyBinding.reset(atspi_action_get_key_binding(ATSPI_ACTION(a.get()), 0, nullptr));
+    g_assert_cmpstr(keyBinding.get(), ==, "");
+}
+
 void beforeAll()
 {
@@ -1908 +1963 @@
     AccessibilityTest::add("WebKitAccessibility", "hyperlink/basic", testHyperlinkBasic);
     AccessibilityTest::add("WebKitAccessibility", "hypertext/basic", testHypertextBasic);
+    AccessibilityTest::add("WebKitAccessibility", "action/basic", testActionBasic);
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp

@@ -795 +795 @@
 bool AccessibilityUIElement::isPressActionSupported()
 {
-    return false;
+    m_element->updateBackingStore();
+    auto name = m_element->actionName();
+    return name == "press" || name == "jump";
 }
 
@@ -1095 +1097 @@
 void AccessibilityUIElement::press()
 {
+    m_element->doAction();
 }