Bug 230254 – [GTK][a11y] Add a build option to enable ATSPI

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Carlos Garcia Campos]

Add USE_ATSPI build option that disables ATK and enables the new atspi based implementation, for now just adding stubs and build fixes with isolated tree enabled.

[Carlos Garcia Campos]

Created attachment 438125 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438127 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438128 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438130 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438131 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438134 [details]
Patch

[Andres Gonzalez]

(In reply to Carlos Garcia Campos from comment #6)
> Created attachment 438134 [details]
> Patch

--- a/Source/WebCore/accessibility/AXObjectCache.cpp
+++ a/Source/WebCore/accessibility/AXObjectCache.cpp
@@ -770,9 +770,13 @@ AccessibilityObject* AXObjectCache::getOrCreate(RenderObject* renderer)
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
 bool AXObjectCache::clientSupportsIsolatedTree()
 {
+#if USE(APPLE_INTERNAL_SDK)

Instead of adding more #if throughout the platform-independent source, it would be cleaner to move this mac implementation to AXObjectCacheMac.mm, and add a new implementation for atspi.

Same comment for AXObjectCache::isIsolatedTreeEnabled, initializeSecondaryAXThread and usedOnAXThread.

[Andres Gonzalez]

(In reply to Carlos Garcia Campos from comment #6)
> Created attachment 438134 [details]
> Patch

--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
+++ a/Source/WebCore/accessibility/AccessibilityObject.cpp
@@ -3782,7 +3782,14 @@ static bool isAccessibilityTextSearchMatch(AXCoreObject* axObject, Accessibility
 {
     if (!axObject)
         return false;
-    return axObject->containsText(criteria.searchText);
+
+    // If text is empty we return true.
+    if (criteria.searchText.isEmpty())
+        return true;
+
+    return containsPlainText(axObject->title(), criteria.searchText, CaseInsensitive)
+        || containsPlainText(axObject->accessibilityDescription(), criteria.searchText, CaseInsensitive)
+        || containsPlainText(axObject->stringValue(), criteria.searchText, CaseInsensitive);
 }

This doesn't seem related to enabling isolated tree, so perhaps you can submit this change as a separate patch.

[Andres Gonzalez]

(In reply to Carlos Garcia Campos from comment #6)
> Created attachment 438134 [details]
> Patch

--- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
+++ a/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp
@@ -71,11 +71,15 @@ void AXIsolatedObject::initializeAttributeData(AXCoreObject& object, bool isRoot
     setProperty(AXPropertyName::ARIALandmarkRoleDescription, object.ariaLandmarkRoleDescription().isolatedCopy());
     setProperty(AXPropertyName::AccessibilityDescription, object.accessibilityDescription().isolatedCopy());
     setProperty(AXPropertyName::BoundingBoxRect, object.boundingBoxRect());
+#if PLATFORM(COCOA)
     setProperty(AXPropertyName::Description, object.descriptionAttributeValue().isolatedCopy());
+#endif

Could we move these platform-specific properties to initializePlatformProperties? That way we wouldn't have to #if throughout here.

[Carlos Garcia Campos]

(In reply to Andres Gonzalez from comment #7)
> (In reply to Carlos Garcia Campos from comment #6)
> > Created attachment 438134 [details]
> > Patch
> 
> --- a/Source/WebCore/accessibility/AXObjectCache.cpp
> +++ a/Source/WebCore/accessibility/AXObjectCache.cpp
> @@ -770,9 +770,13 @@ AccessibilityObject*
> AXObjectCache::getOrCreate(RenderObject* renderer)
>  #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
>  bool AXObjectCache::clientSupportsIsolatedTree()
>  {
> +#if USE(APPLE_INTERNAL_SDK)
> 
> Instead of adding more #if throughout the platform-independent source, it
> would be cleaner to move this mac implementation to AXObjectCacheMac.mm, and
> add a new implementation for atspi.
> 
> Same comment for AXObjectCache::isIsolatedTreeEnabled,
> initializeSecondaryAXThread and usedOnAXThread.

Ok

[Carlos Garcia Campos]

(In reply to Andres Gonzalez from comment #8)
> (In reply to Carlos Garcia Campos from comment #6)
> > Created attachment 438134 [details]
> > Patch
> 
> --- a/Source/WebCore/accessibility/AccessibilityObject.cpp
> +++ a/Source/WebCore/accessibility/AccessibilityObject.cpp
> @@ -3782,7 +3782,14 @@ static bool
> isAccessibilityTextSearchMatch(AXCoreObject* axObject, Accessibility
>  {
>      if (!axObject)
>          return false;
> -    return axObject->containsText(criteria.searchText);
> +
> +    // If text is empty we return true.
> +    if (criteria.searchText.isEmpty())
> +        return true;
> +
> +    return containsPlainText(axObject->title(), criteria.searchText,
> CaseInsensitive)
> +        || containsPlainText(axObject->accessibilityDescription(),
> criteria.searchText, CaseInsensitive)
> +        || containsPlainText(axObject->stringValue(), criteria.searchText,
> CaseInsensitive);
>  }
> 
> This doesn't seem related to enabling isolated tree, so perhaps you can
> submit this change as a separate patch.

Right, this is weird here, The reason of this change is because WTR uses the WebCore wrappers, and including TextIterator.h from the header pulled too many things that caused linking errors. I'll split the patch.

[Carlos Garcia Campos]

Created attachment 438324 [details]
Patch

[Carlos Garcia Campos]

Created attachment 438326 [details]
Patch

[Adrian Perez]

Comment on attachment 438326 [details]
Patch

Approved, as it seems all the review concerns have been adressed :)

[Carlos Garcia Campos]

Committed r282643 (241797@main): <https://commits.webkit.org/241797@main>