Diff
Modified: trunk/Source/WebCore/ChangeLog (286092 => 286093)
--- trunk/Source/WebCore/ChangeLog 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Source/WebCore/ChangeLog 2021-11-20 07:52:57 UTC (rev 286093)
@@ -1,3 +1,19 @@
+2021-11-19 Carlos Garcia Campos <cgar...@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-qu...@webkit.org>
Unreviewed, reverting r286058.
Modified: trunk/Source/WebCore/SourcesGTK.txt (286092 => 286093)
--- trunk/Source/WebCore/SourcesGTK.txt 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Source/WebCore/SourcesGTK.txt 2021-11-20 07:52:57 UTC (rev 286093)
@@ -46,6 +46,7 @@
accessibility/atspi/AccessibilityObjectDocumentAtspi.cpp
accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp
accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp
+accessibility/atspi/AccessibilityObjectImageAtspi.cpp
accessibility/atspi/AccessibilityObjectTextAtspi.cpp
accessibility/atspi/AccessibilityObjectValueAtspi.cpp
accessibility/atspi/AccessibilityRootAtspi.cpp
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (286092 => 286093)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2021-11-20 07:52:57 UTC (rev 286093)
@@ -94,6 +94,9 @@
if (coreObject.roleValue() == AccessibilityRole::WebArea)
interfaces.add(Interface::Document);
+ if (coreObject.isImage())
+ interfaces.add(Interface::Image);
+
return interfaces;
}
@@ -490,6 +493,8 @@
interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_action_interface), &s_actionFunctions });
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));
}
@@ -1132,6 +1137,8 @@
g_variant_builder_add(builder, "s", webkit_action_interface.name);
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);
}
void AccessibilityObjectAtspi::serialize(GVariantBuilder* builder) const
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h (286092 => 286093)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2021-11-20 07:52:57 UTC (rev 286093)
@@ -42,7 +42,7 @@
static Ref<AccessibilityObjectAtspi> create(AXCoreObject*);
~AccessibilityObjectAtspi() = default;
- enum class Interface : uint8_t {
+ enum class Interface : uint16_t {
Accessible = 1 << 0,
Component = 1 << 1,
Text = 1 << 2,
@@ -50,7 +50,8 @@
Hyperlink = 1 << 4,
Hypertext = 1 << 5,
Action = 1 << 6,
- Document = 1 << 7
+ Document = 1 << 7,
+ Image = 1 << 8
};
const OptionSet<Interface>& interfaces() const { return m_interfaces; }
@@ -175,6 +176,8 @@
HashMap<String, String> documentAttributes() const;
String documentLocale() const;
+ String imageDescription() const;
+
static OptionSet<Interface> interfacesForObject(AXCoreObject&);
static GDBusInterfaceVTable s_accessibleFunctions;
@@ -185,6 +188,7 @@
static GDBusInterfaceVTable s_hypertextFunctions;
static GDBusInterfaceVTable s_actionFunctions;
static GDBusInterfaceVTable s_documentFunctions;
+ static GDBusInterfaceVTable s_imageFunctions;
AXCoreObject* m_axObject { nullptr };
AXCoreObject* m_coreObject { nullptr };
Added: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp (0 => 286093)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp (rev 0)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectImageAtspi.cpp 2021-11-20 07:52:57 UTC (rev 286093)
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2021 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "AccessibilityObjectAtspi.h"
+
+#if ENABLE(ACCESSIBILITY) && USE(ATSPI)
+
+#include "AccessibilityAtspiEnums.h"
+#include "AccessibilityObject.h"
+#include <gio/gio.h>
+
+namespace WebCore {
+
+GDBusInterfaceVTable AccessibilityObjectAtspi::s_imageFunctions = {
+ // method_call
+ [](GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar* methodName, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer userData) {
+ RELEASE_ASSERT(!isMainThread());
+ auto atspiObject = Ref { *static_cast<AccessibilityObjectAtspi*>(userData) };
+ atspiObject->updateBackingStore();
+
+ if (!g_strcmp0(methodName, "GetImageExtents")) {
+ uint32_t coordinateType;
+ g_variant_get(parameters, "(u)", &coordinateType);
+ auto rect = atspiObject->elementRect(coordinateType);
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("((iiii))", rect.x(), rect.y(), rect.width(), rect.height()));
+ } else if (!g_strcmp0(methodName, "GetImagePosition")) {
+ uint32_t coordinateType;
+ g_variant_get(parameters, "(u)", &coordinateType);
+ auto rect = atspiObject->elementRect(coordinateType);
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("(ii)", rect.x(), rect.y()));
+ } else if (!g_strcmp0(methodName, "GetImageSize")) {
+ auto rect = atspiObject->elementRect(Atspi::CoordinateType::ParentCoordinates);
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("(ii)", rect.width(), rect.height()));
+ }
+ },
+ // get_property
+ [](GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar* propertyName, GError** error, gpointer userData) -> GVariant* {
+ RELEASE_ASSERT(!isMainThread());
+ auto atspiObject = Ref { *static_cast<AccessibilityObjectAtspi*>(userData) };
+ atspiObject->updateBackingStore();
+
+ if (!g_strcmp0(propertyName, "ImageDescription"))
+ return g_variant_new_string(atspiObject->imageDescription().utf8().data());
+ if (!g_strcmp0(propertyName, "ImageLocale"))
+ return g_variant_new_string(atspiObject->locale().utf8().data());
+
+ g_set_error(error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Unknown property '%s'", propertyName);
+ return nullptr;
+ },
+ // set_property,
+ nullptr,
+ // padding
+ nullptr
+};
+
+String AccessibilityObjectAtspi::imageDescription() const
+{
+ RELEASE_ASSERT(!isMainThread());
+ if (!m_axObject)
+ return { };
+
+ Vector<AccessibilityText> textOrder;
+ m_axObject->accessibilityText(textOrder);
+
+ bool visibleTextAvailable = false;
+ for (const AccessibilityText& text : textOrder) {
+ if (text.textSource == AccessibilityTextSource::Alternative)
+ return text.text;
+
+ switch (text.textSource) {
+ case AccessibilityTextSource::Visible:
+ case AccessibilityTextSource::Children:
+ case AccessibilityTextSource::LabelByElement:
+ visibleTextAvailable = true;
+ default:
+ break;
+ }
+
+ if (text.textSource == AccessibilityTextSource::TitleTag && !visibleTextAvailable)
+ return text.text;
+ }
+
+ return { };
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
Modified: trunk/Tools/ChangeLog (286092 => 286093)
--- trunk/Tools/ChangeLog 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Tools/ChangeLog 2021-11-20 07:52:57 UTC (rev 286093)
@@ -1,3 +1,16 @@
+2021-11-19 Carlos Garcia Campos <cgar...@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 <achristen...@webkit.org>
Implement extension-path variant of redirect action in WKContentRuleList
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp (286092 => 286093)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp 2021-11-20 06:57:51 UTC (rev 286092)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp 2021-11-20 07:52:57 UTC (rev 286093)
@@ -2001,6 +2001,51 @@
#endif
}
+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='' 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()
{
AccessibilityTest::add("WebKitAccessibility", "accessible/basic-hierarchy", testAccessibleBasicHierarchy);
@@ -2026,6 +2071,7 @@
AccessibilityTest::add("WebKitAccessibility", "hypertext/basic", testHypertextBasic);
AccessibilityTest::add("WebKitAccessibility", "action/basic", testActionBasic);
AccessibilityTest::add("WebKitAccessibility", "document/basic", testDocumentBasic);
+ AccessibilityTest::add("WebKitAccessibility", "image/basic", testImageBasic);
}
void afterAll()
