Diff
Modified: trunk/Source/WebCore/ChangeLog (286054 => 286055)
--- trunk/Source/WebCore/ChangeLog 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/ChangeLog 2021-11-19 13:35:55 UTC (rev 286055)
@@ -1,5 +1,30 @@
2021-11-19 Carlos Garcia Campos <[email protected]>
+ [GTK][a11y] Add implementation of hypertext interface when building with ATSPI
+ https://bugs.webkit.org/show_bug.cgi?id=232708
+
+ Reviewed by Adrian Perez de Castro.
+
+ * SourcesGTK.txt:
+ * accessibility/atspi/AccessibilityAtspi.cpp:
+ (WebCore::AccessibilityAtspi::unregisterObject):
+ (WebCore::AccessibilityAtspi::registerHyperlink):
+ * accessibility/atspi/AccessibilityAtspi.h:
+ * accessibility/atspi/AccessibilityObjectAtspi.cpp:
+ (WebCore::AccessibilityObjectAtspi::interfacesForObject):
+ (WebCore::AccessibilityObjectAtspi::path):
+ (WebCore::AccessibilityObjectAtspi::hyperlinkReference):
+ (WebCore::AccessibilityObjectAtspi::buildInterfaces const):
+ * accessibility/atspi/AccessibilityObjectAtspi.h:
+ * accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp: Added.
+ (WebCore::AccessibilityObjectAtspi::hyperlinkCount const):
+ (WebCore::AccessibilityObjectAtspi::hyperlink const):
+ (WebCore::AccessibilityObjectAtspi::hyperlinkIndex const):
+ * accessibility/atspi/AccessibilityObjectTextAtspi.cpp:
+ (WebCore::AccessibilityObjectAtspi::characterIndex const):
+
+2021-11-19 Carlos Garcia Campos <[email protected]>
+
[GTK][a11y] Add implementation of hyperlink interface when building with ATSPI
https://bugs.webkit.org/show_bug.cgi?id=232707
Modified: trunk/Source/WebCore/SourcesGTK.txt (286054 => 286055)
--- trunk/Source/WebCore/SourcesGTK.txt 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/SourcesGTK.txt 2021-11-19 13:35:55 UTC (rev 286055)
@@ -43,6 +43,7 @@
accessibility/atspi/AccessibilityObjectAtspi.cpp
accessibility/atspi/AccessibilityObjectComponentAtspi.cpp
accessibility/atspi/AccessibilityObjectHyperlinkAtspi.cpp
+accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp
accessibility/atspi/AccessibilityObjectTextAtspi.cpp
accessibility/atspi/AccessibilityObjectValueAtspi.cpp
accessibility/atspi/AccessibilityRootAtspi.cpp
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp (286054 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp 2021-11-19 13:35:55 UTC (rev 286055)
@@ -135,6 +135,12 @@
if (!m_connection)
return;
+ if (m_atspiHyperlinks.contains(atspiObject.ptr())) {
+ auto registeredObjects = m_atspiHyperlinks.take(atspiObject.ptr());
+ for (auto id : registeredObjects)
+ g_dbus_connection_unregister_object(m_connection.get(), id);
+ }
+
g_dbus_connection_emit_signal(m_connection.get(), nullptr, atspiObject->path().utf8().data(), "org.a11y.atspi.Event.Object", "StateChanged",
g_variant_new("(siiva{sv})", "defunct", TRUE, 0, g_variant_new_string("0"), nullptr), nullptr);
@@ -146,6 +152,24 @@
});
}
+String AccessibilityAtspi::registerHyperlink(AccessibilityObjectAtspi& atspiObject, Vector<std::pair<GDBusInterfaceInfo*, GDBusInterfaceVTable*>>&& interfaces)
+{
+ RELEASE_ASSERT(!isMainThread());
+ if (!m_connection)
+ return { };
+
+ String path = makeString("/org/a11y/atspi/accessible/", createCanonicalUUIDString().replace('-', '_'));
+ Vector<unsigned, 1> registeredObjects;
+ registeredObjects.reserveInitialCapacity(interfaces.size());
+ for (const auto& interface : interfaces) {
+ auto id = g_dbus_connection_register_object(m_connection.get(), path.utf8().data(), interface.first, interface.second, &atspiObject, nullptr, nullptr);
+ registeredObjects.uncheckedAppend(id);
+ }
+ m_atspiHyperlinks.add(&atspiObject, WTFMove(registeredObjects));
+
+ return path;
+}
+
void AccessibilityAtspi::childrenChanged(AccessibilityObjectAtspi& atspiObject, AccessibilityObjectAtspi& child, ChildrenChanged change)
{
RELEASE_ASSERT(isMainThread());
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h (286054 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h 2021-11-19 13:35:55 UTC (rev 286055)
@@ -52,6 +52,7 @@
void unregisterRoot(AccessibilityRootAtspi&);
String registerObject(AccessibilityObjectAtspi&, Vector<std::pair<GDBusInterfaceInfo*, GDBusInterfaceVTable*>>&&);
void unregisterObject(AccessibilityObjectAtspi&);
+ String registerHyperlink(AccessibilityObjectAtspi&, Vector<std::pair<GDBusInterfaceInfo*, GDBusInterfaceVTable*>>&&);
enum class ChildrenChanged { Added, Removed };
void childrenChanged(AccessibilityObjectAtspi&, AccessibilityObjectAtspi&, ChildrenChanged);
@@ -78,6 +79,7 @@
GRefPtr<GDBusConnection> m_connection;
HashMap<AccessibilityRootAtspi*, Vector<unsigned, 2>> m_rootObjects;
HashMap<AccessibilityObjectAtspi*, Vector<unsigned, 20>> m_atspiObjects;
+ HashMap<AccessibilityObjectAtspi*, Vector<unsigned, 20>> m_atspiHyperlinks;
unsigned m_cacheID { 0 };
HashMap<String, AccessibilityObjectAtspi*> m_cache;
};
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (286054 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2021-11-19 13:35:55 UTC (rev 286055)
@@ -69,6 +69,7 @@
interfaces.add(Interface::Text);
else if (!coreObject.isWebArea()) {
if (coreObject.roleValue() != AccessibilityRole::Table) {
+ interfaces.add(Interface::Hypertext);
if ((renderer && renderer->childrenInline()) || roleIsTextType(coreObject.roleValue()) || coreObject.isMathToken())
interfaces.add(Interface::Text);
}
@@ -480,6 +481,8 @@
interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_value_interface), &s_valueFunctions });
if (m_interfaces.contains(Interface::Hyperlink))
interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_hyperlink_interface), &s_hyperlinkFunctions });
+ if (m_interfaces.contains(Interface::Hypertext))
+ interfaces.append({ const_cast<GDBusInterfaceInfo*>(&webkit_hypertext_interface), &s_hypertextFunctions });
m_path = atspiRoot->atspi().registerObject(*this, WTFMove(interfaces));
}
@@ -492,6 +495,17 @@
return g_variant_new("(so)", root()->atspi().uniqueName(), path().utf8().data());
}
+GVariant* AccessibilityObjectAtspi::hyperlinkReference()
+{
+ RELEASE_ASSERT(!isMainThread());
+ if (m_hyperlinkPath.isNull()) {
+ path();
+ m_hyperlinkPath = root()->atspi().registerHyperlink(*this, { { const_cast<GDBusInterfaceInfo*>(&webkit_hyperlink_interface), &s_hyperlinkFunctions } });
+ }
+
+ return g_variant_new("(so)", root()->atspi().uniqueName(), m_hyperlinkPath.utf8().data());
+}
+
void AccessibilityObjectAtspi::setRoot(AccessibilityRootAtspi* root)
{
Locker locker { m_rootLock };
@@ -1099,6 +1113,8 @@
g_variant_builder_add(builder, "s", webkit_value_interface.name);
if (m_interfaces.contains(Interface::Hyperlink))
g_variant_builder_add(builder, "s", webkit_hyperlink_interface.name);
+ if (m_interfaces.contains(Interface::Hypertext))
+ g_variant_builder_add(builder, "s", webkit_hypertext_interface.name);
}
void AccessibilityObjectAtspi::serialize(GVariantBuilder* builder) const
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h (286054 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h 2021-11-19 13:35:55 UTC (rev 286055)
@@ -47,7 +47,8 @@
Component = 1 << 1,
Text = 1 << 2,
Value = 1 << 3,
- Hyperlink = 1 << 4
+ Hyperlink = 1 << 4,
+ Hypertext = 1 << 5
};
const OptionSet<Interface>& interfaces() const { return m_interfaces; }
@@ -66,6 +67,7 @@
const String& path();
GVariant* reference();
+ GVariant* hyperlinkReference();
void serialize(GVariantBuilder*) const;
WEBCORE_EXPORT String id() const;
@@ -143,6 +145,7 @@
CString textAtOffset(int, TextGranularity, int&, int&) const;
int characterAtOffset(int) const;
std::optional<unsigned> characterOffset(UChar, int) const;
+ std::optional<unsigned> characterIndex(UChar, unsigned) const;
IntRect textExtents(int, int, uint32_t) const;
int offsetAtPoint(const IntPoint&, uint32_t) const;
IntPoint boundsForSelection(const VisibleSelection&) const;
@@ -154,6 +157,10 @@
unsigned offsetInParent() const;
+ unsigned hyperlinkCount() const;
+ AccessibilityObjectAtspi* hyperlink(unsigned) const;
+ std::optional<unsigned> hyperlinkIndex(unsigned) const;
+
static OptionSet<Interface> interfacesForObject(AXCoreObject&);
static GDBusInterfaceVTable s_accessibleFunctions;
@@ -161,6 +168,7 @@
static GDBusInterfaceVTable s_textFunctions;
static GDBusInterfaceVTable s_valueFunctions;
static GDBusInterfaceVTable s_hyperlinkFunctions;
+ static GDBusInterfaceVTable s_hypertextFunctions;
AXCoreObject* m_axObject { nullptr };
AXCoreObject* m_coreObject { nullptr };
@@ -169,6 +177,7 @@
std::optional<AccessibilityObjectAtspi*> m_parent;
Atomic<bool> m_isRegistered { false };
String m_path;
+ String m_hyperlinkPath;
mutable int m_indexInParent { -1 };
mutable Lock m_rootLock;
};
Added: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp (0 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp (rev 0)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectHypertextAtspi.cpp 2021-11-19 13:35:55 UTC (rev 286055)
@@ -0,0 +1,122 @@
+/*
+ * 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 "AccessibilityRootAtspi.h"
+#include <gio/gio.h>
+#include <wtf/unicode/CharacterNames.h>
+
+namespace WebCore {
+
+GDBusInterfaceVTable AccessibilityObjectAtspi::s_hypertextFunctions = {
+ // 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, "GetNLinks")) {
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", atspiObject->hyperlinkCount()));
+ } else if (!g_strcmp0(methodName, "GetLink")) {
+ int index;
+ g_variant_get(parameters, "(i)", &index);
+ auto* wrapper = index >= 0 ? atspiObject->hyperlink(index) : nullptr;
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("(@(so))", wrapper ? wrapper->hyperlinkReference() : atspiObject->root()->atspi().nullReference()));
+ } else if (!g_strcmp0(methodName, "GetLinkIndex")) {
+ int offset;
+ g_variant_get(parameters, "(i)", &offset);
+ g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", offset >= 0 ? atspiObject->hyperlinkIndex(offset).value_or(-1) : -1));
+ }
+ },
+ // get_property
+ nullptr,
+ // set_property,
+ nullptr,
+ // padding
+ nullptr
+};
+
+unsigned AccessibilityObjectAtspi::hyperlinkCount() const
+{
+ return Accessibility::retrieveValueFromMainThread<unsigned>([this]() -> unsigned {
+ if (m_coreObject)
+ m_coreObject->updateBackingStore();
+
+ if (!m_coreObject)
+ return 0;
+
+ unsigned linkCount = 0;
+ const auto& children = m_coreObject->children();
+ for (const auto& child : children) {
+ if (child->accessibilityIsIgnored())
+ continue;
+
+ auto* wrapper = child->wrapper();
+ if (wrapper && wrapper->interfaces().contains(Interface::Hyperlink))
+ linkCount++;
+ }
+
+ return linkCount;
+ });
+}
+
+AccessibilityObjectAtspi* AccessibilityObjectAtspi::hyperlink(unsigned index) const
+{
+ return Accessibility::retrieveValueFromMainThread<AccessibilityObjectAtspi*>([this, index]() -> AccessibilityObjectAtspi* {
+ if (m_coreObject)
+ m_coreObject->updateBackingStore();
+
+ if (!m_coreObject)
+ return nullptr;
+
+ const auto& children = m_coreObject->children();
+ if (index >= children.size())
+ return nullptr;
+
+ int linkIndex = -1;
+ for (const auto& child : children) {
+ if (child->accessibilityIsIgnored())
+ continue;
+
+ auto* wrapper = child->wrapper();
+ if (!wrapper || !wrapper->interfaces().contains(Interface::Hyperlink))
+ continue;
+
+ if (static_cast<unsigned>(++linkIndex) == index) {
+ wrapper->setRoot(root());
+ return wrapper;
+ }
+ }
+
+ return nullptr;
+ });
+}
+
+std::optional<unsigned> AccessibilityObjectAtspi::hyperlinkIndex(unsigned offset) const
+{
+ return characterIndex(objectReplacementCharacter, offset);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(ACCESSIBILITY) && USE(ATSPI)
Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp (286054 => 286055)
--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectTextAtspi.cpp 2021-11-19 13:35:55 UTC (rev 286055)
@@ -508,6 +508,38 @@
return UTF16OffsetToUTF8(mapping, offset);
}
+std::optional<unsigned> AccessibilityObjectAtspi::characterIndex(UChar character, unsigned offset) const
+{
+ auto utf16Text = text();
+ auto utf8Text = utf16Text.utf8();
+ if (utf8Text.isNull())
+ return std::nullopt;
+
+ auto length = g_utf8_strlen(utf8Text.data(), -1);
+ if (offset >= length)
+ return std::nullopt;
+
+ auto mapping = offsetMapping(utf16Text);
+ auto utf16Offset = UTF8OffsetToUTF16(mapping, offset);
+ if (utf16Text[utf16Offset] != character)
+ return std::nullopt;
+
+ unsigned start = 0;
+ int index = -1;
+ size_t position;
+ while ((position = utf16Text.find(character, start)) != notFound) {
+ index++;
+ if (static_cast<unsigned>(position) == utf16Offset)
+ break;
+ start = position + 1;
+ }
+
+ if (index == -1)
+ return std::nullopt;
+
+ return index;
+}
+
IntRect AccessibilityObjectAtspi::boundsForRange(unsigned utf16Offset, unsigned length, uint32_t coordinateType) const
{
return Accessibility::retrieveValueFromMainThread<IntRect>([this, utf16Offset, length, coordinateType]() -> IntRect {
Modified: trunk/Tools/ChangeLog (286054 => 286055)
--- trunk/Tools/ChangeLog 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Tools/ChangeLog 2021-11-19 13:35:55 UTC (rev 286055)
@@ -1,5 +1,18 @@
2021-11-19 Carlos Garcia Campos <[email protected]>
+ [GTK][a11y] Add implementation of hypertext interface when building with ATSPI
+ https://bugs.webkit.org/show_bug.cgi?id=232708
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add unit tests to check hypertext interface.
+
+ * TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp:
+ (testHypertextBasic):
+ (beforeAll):
+
+2021-11-19 Carlos Garcia Campos <[email protected]>
+
Unreviewed. [GLIB] Add new test case to /jsc/class
Add a test case to check using JSC_TYPE_VALUE for a JSCClass property.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp (286054 => 286055)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp 2021-11-19 09:52:50 UTC (rev 286054)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitAccessibility.cpp 2021-11-19 13:35:55 UTC (rev 286055)
@@ -1817,6 +1817,73 @@
g_assert_true(atspi_hyperlink_get_object(ATSPI_HYPERLINK(link.get()), 0, nullptr) == link2.get());
}
+static void testHypertextBasic(AccessibilityTest* test, gconstpointer)
+{
+ test->showInWindow(800, 600);
+ test->loadHtml(
+ "<html>"
+ " <body>"
+ " <p>This is <button>button</button> and <a href=''>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_HYPERTEXT(p.get()));
+ g_assert_cmpint(atspi_hypertext_get_n_links(ATSPI_HYPERTEXT(p.get()), nullptr), ==, 2);
+
+ auto link = adoptGRef(atspi_hypertext_get_link(ATSPI_HYPERTEXT(p.get()), 0, nullptr));
+ g_assert_true(ATSPI_IS_HYPERLINK(link.get()));
+ g_assert_cmpint(atspi_hyperlink_get_n_anchors(ATSPI_HYPERLINK(link.get()), nullptr), ==, 1);
+ g_assert_true(atspi_hyperlink_is_valid(ATSPI_HYPERLINK(link.get()), nullptr));
+ g_assert_cmpint(atspi_hyperlink_get_start_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 8);
+#if USE(ATSPI)
+ g_assert_cmpint(atspi_hyperlink_get_end_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 9);
+#else
+ g_assert_cmpint(atspi_hyperlink_get_end_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 15);
+#endif
+ GUniquePtr<char> uri(atspi_hyperlink_get_uri(ATSPI_HYPERLINK(link.get()), 0, nullptr));
+ g_assert_cmpstr(uri.get(), ==, "");
+ auto button = adoptGRef(atspi_accessible_get_child_at_index(p.get(), 0, nullptr));
+ g_assert_true(atspi_hyperlink_get_object(ATSPI_HYPERLINK(link.get()), 0, nullptr) == button.get());
+
+ link = adoptGRef(atspi_hypertext_get_link(ATSPI_HYPERTEXT(p.get()), 1, nullptr));
+ g_assert_true(ATSPI_IS_HYPERLINK(link.get()));
+ g_assert_cmpint(atspi_hyperlink_get_n_anchors(ATSPI_HYPERLINK(link.get()), nullptr), ==, 1);
+ g_assert_true(atspi_hyperlink_is_valid(ATSPI_HYPERLINK(link.get()), nullptr));
+#if USE(ATSPI)
+ g_assert_cmpint(atspi_hyperlink_get_start_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 14);
+ g_assert_cmpint(atspi_hyperlink_get_end_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 15);
+#else
+ g_assert_cmpint(atspi_hyperlink_get_start_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 20);
+ g_assert_cmpint(atspi_hyperlink_get_end_index(ATSPI_HYPERLINK(link.get()), nullptr), ==, 24);
+#endif
+ uri.reset(atspi_hyperlink_get_uri(ATSPI_HYPERLINK(link.get()), 0, nullptr));
+ g_assert_cmpstr(uri.get(), ==, "https://www.webkitgtk.org/");
+ auto a = adoptGRef(atspi_accessible_get_child_at_index(p.get(), 1, nullptr));
+ g_assert_true(atspi_hyperlink_get_object(ATSPI_HYPERLINK(link.get()), 0, nullptr) == a.get());
+
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 0, nullptr), ==, -1);
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 8, nullptr), ==, 0);
+#if USE(ATSPI)
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 9, nullptr), ==, -1);
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 14, nullptr), ==, 1);
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 15, nullptr), ==, -1);
+#else
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 15, nullptr), ==, -1);
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 20, nullptr), ==, 1);
+ g_assert_cmpint(atspi_hypertext_get_link_index(ATSPI_HYPERTEXT(p.get()), 24, nullptr), ==, -1);
+#endif
+}
+
void beforeAll()
{
AccessibilityTest::add("WebKitAccessibility", "accessible/basic-hierarchy", testAccessibleBasicHierarchy);
@@ -1839,6 +1906,7 @@
AccessibilityTest::add("WebKitAccessibility", "text/replaced-objects", testTextReplacedObjects);
AccessibilityTest::add("WebKitAccessibility", "value/basic", testValueBasic);
AccessibilityTest::add("WebKitAccessibility", "hyperlink/basic", testHyperlinkBasic);
+ AccessibilityTest::add("WebKitAccessibility", "hypertext/basic", testHypertextBasic);
}
void afterAll()
