Changeset 286093 in webkit

Timestamp:

Nov 19, 2021, 11:52:57 PM (5 years ago)

Author:

Carlos Garcia Campos

Message:

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

Reviewed by Adrian Perez de Castro.

Source/WebCore:

• SourcesGTK.txt:
• accessibility/atspi/AccessibilityObjectAtspi.cpp:

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

• accessibility/atspi/AccessibilityObjectAtspi.h:
• accessibility/atspi/AccessibilityObjectImageAtspi.cpp: Added.

(WebCore::AccessibilityObjectAtspi::imageDescription const):

Tools:

Add unit tests for the image interface.

• TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:

(testImageBasic):
(beforeAll):

Location:

trunk

Files:

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

trunk/Source/WebCore/ChangeLog

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

trunk/Source/WebCore/SourcesGTK.txt

@@ -47 +47 @@
 accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp
 accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp
+accessibility/atspi/AccessibilityObjectImageAtspi.cpp
 accessibility/atspi/AccessibilityObjectTextAtspi.cpp
 accessibility/atspi/AccessibilityObjectValueAtspi.cpp

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

@@ -94 +94 @@
     if (coreObject.roleValue() == AccessibilityRole::WebArea)
         interfaces.add(Interface::Document);
+
+    if (coreObject.isImage())
+        interfaces.add(Interface::Image);
 
     return interfaces;
@@ -491 +494 @@
         if (m_interfaces.contains(Interface::Document))
             interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_document_interface), &s_documentFunctions });
+        if (m_interfaces.contains(Interface::Image))
+            interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_image_interface), &s_imageFunctions });
         m_path = atspiRoot->atspi().registerObject(*this, WTFMove(interfaces));
     }
@@ -1133 +1138 @@
     if (m_interfaces.contains(Interface::Document))
         g_variant_builder_add(builder, "s", webkit_document_interface.name);
+    if (m_interfaces.contains(Interface::Image))
+        g_variant_builder_add(builder, "s", webkit_image_interface.name);
 }
 

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

@@ -43 +43 @@
     ~AccessibilityObjectAtspi() = default;
 
-    enum class Interface : uint8_t {
+    enum class Interface : uint16_t {
         Accessible = 1 << 0,
         Component = 1 << 1,
@@ -51 +51 @@
         Hypertext = 1 << 5,
         Action = 1 << 6,
-        Document = 1 << 7
+        Document = 1 << 7,
+        Image = 1 << 8
     };
     const OptionSet<Interface>& interfaces() const { return m_interfaces; }
@@ -176 +177 @@
     String documentLocale() const;
 
+    String imageDescription() const;
+
     static OptionSet<Interface> interfacesForObject(AXCoreObject&);
 
@@ -186 +189 @@
     static GDBusInterfaceVTable s_actionFunctions;
     static GDBusInterfaceVTable s_documentFunctions;
+    static GDBusInterfaceVTable s_imageFunctions;
 
     AXCoreObject* m_axObject { nullptr };

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][a11y] Add implementation of image interface when building with ATSPI
+        https://bugs.webkit.org/show_bug.cgi?id=232782
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add unit tests for the image interface.
+
+        * TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:
+        (testImageBasic):
+        (beforeAll):
+
 2021-11-19  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -2002 +2002 @@
 }
 
+static void testImageBasic(AccessibilityTest* test, gconstpointer)
+{
+    test->showInWindow(800, 600);
+    GUniquePtr<char> baseDir(g_strdup_printf("file://%s/", Test::getResourcesDir().data()));
+    test->loadHtml(
+        "<html>"
+        "  <body>"
+        "    <img style='position:absolute; left:1; top:1' src='blank.ico' width=5 height=5 alt='This is a blank icon' lang='en'></img>"
+        "  </body>"
+        "</html>",
+        baseDir.get());
+    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 img = adoptGRef(atspi_accessible_get_child_at_index(documentWeb.get(), 0, nullptr));
+    g_assert_true(ATSPI_IS_IMAGE(img.get()));
+    GUniquePtr<AtspiRect> rect(atspi_image_get_image_extents(ATSPI_IMAGE(img.get()), ATSPI_COORD_TYPE_WINDOW, nullptr));
+    g_assert_nonnull(rect.get());
+    g_assert_cmpuint(rect->x, ==, 1);
+    g_assert_cmpuint(rect->y, ==, 1);
+    g_assert_cmpuint(rect->width, ==, 5);
+    g_assert_cmpuint(rect->height, ==, 5);
+    GUniquePtr<AtspiPoint> point(atspi_image_get_image_position(ATSPI_IMAGE(img.get()), ATSPI_COORD_TYPE_WINDOW, nullptr));
+    g_assert_nonnull(point.get());
+    g_assert_cmpuint(rect->x, ==, point->x);
+    g_assert_cmpuint(rect->y, ==, point->y);
+    GUniquePtr<AtspiPoint> size(atspi_image_get_image_size(ATSPI_IMAGE(img.get()), nullptr));
+    g_assert_nonnull(size.get());
+    g_assert_cmpuint(size->x, ==, rect->width);
+    g_assert_cmpuint(size->y, ==, rect->height);
+
+    GUniquePtr<char> description(atspi_image_get_image_description(ATSPI_IMAGE(img.get()), nullptr));
+    g_assert_cmpstr(description.get(), ==, "This is a blank icon");
+#if USE(ATSPI)
+    GUniquePtr<char> locale(atspi_image_get_image_locale(ATSPI_IMAGE(img.get()), nullptr));
+    g_assert_cmpstr(locale.get(), ==, "en");
+#endif
+}
+
 void beforeAll()
 {
@@ -2027 +2072 @@
     AccessibilityTest::add("WebKitAccessibility", "action/basic", testActionBasic);
     AccessibilityTest::add("WebKitAccessibility", "document/basic", testDocumentBasic);
+    AccessibilityTest::add("WebKitAccessibility", "image/basic", testImageBasic);
 }