Title: [288730] trunk/Source/WebCore
Revision
288730
Author
carlo...@webkit.org
Date
2022-01-27 23:04:12 -0800 (Thu, 27 Jan 2022)

Log Message

[GTK][a11y] Do not set the accessibility root object on svg image page elements with ATSPI
https://bugs.webkit.org/show_bug.cgi?id=235705

Reviewed by Adrian Perez de Castro.

This was needed only because of isolated tree mode.

* accessibility/AccessibilityRenderObject.cpp:
* accessibility/atspi/AXObjectCacheAtspi.cpp:
* accessibility/atspi/AccessibilityObjectAtspi.cpp:
* accessibility/atspi/AccessibilityObjectAtspi.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (288729 => 288730)


--- trunk/Source/WebCore/ChangeLog	2022-01-28 07:03:26 UTC (rev 288729)
+++ trunk/Source/WebCore/ChangeLog	2022-01-28 07:04:12 UTC (rev 288730)
@@ -1,5 +1,19 @@
 2022-01-27  Carlos Garcia Campos  <cgar...@igalia.com>
 
+        [GTK][a11y] Do not set the accessibility root object on svg image page elements with ATSPI
+        https://bugs.webkit.org/show_bug.cgi?id=235705
+
+        Reviewed by Adrian Perez de Castro.
+
+        This was needed only because of isolated tree mode.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        * accessibility/atspi/AXObjectCacheAtspi.cpp:
+        * accessibility/atspi/AccessibilityObjectAtspi.cpp:
+        * accessibility/atspi/AccessibilityObjectAtspi.h:
+
+2022-01-27  Carlos Garcia Campos  <cgar...@igalia.com>
+
         [GTK][a11y] Ignore span elements with ATSPI
         https://bugs.webkit.org/show_bug.cgi?id=235704
 

Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (288729 => 288730)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2022-01-28 07:03:26 UTC (rev 288729)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2022-01-28 07:04:12 UTC (rev 288730)
@@ -3296,11 +3296,6 @@
     if (!cache)
         return nullptr;
 
-#if USE(ATSPI)
-    if (auto* page = document->page())
-        page->setAccessibilityRootObject(createIfNecessary == Create ? axObjectCache()->document().page()->accessibilityRootObject() : nullptr);
-#endif
-
     AccessibilityObject* rootSVGObject = createIfNecessary == Create ? cache->getOrCreate(rendererRoot) : cache->get(rendererRoot);
 
     ASSERT(!createIfNecessary || rootSVGObject);

Modified: trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp (288729 => 288730)


--- trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp	2022-01-28 07:03:26 UTC (rev 288729)
+++ trunk/Source/WebCore/accessibility/atspi/AXObjectCacheAtspi.cpp	2022-01-28 07:04:12 UTC (rev 288730)
@@ -35,8 +35,7 @@
 
 void AXObjectCache::attachWrapper(AXCoreObject* axObject)
 {
-    auto* atspiRoot = document().page()->accessibilityRootObject();
-    auto wrapper = AccessibilityObjectAtspi::create(axObject, atspiRoot);
+    auto wrapper = AccessibilityObjectAtspi::create(axObject, document().page()->accessibilityRootObject());
     axObject->setWrapper(wrapper.ptr());
 
     m_deferredParentChangedList.add(axObject);

Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (288729 => 288730)


--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp	2022-01-28 07:03:26 UTC (rev 288729)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp	2022-01-28 07:04:12 UTC (rev 288730)
@@ -468,15 +468,6 @@
     nullptr
 };
 
-AccessibilityRootAtspi* AccessibilityObjectAtspi::root()
-{
-    if (!m_root) {
-        if (auto* document = m_coreObject->document())
-            m_root = document->page()->accessibilityRootObject();
-    }
-    return m_root;
-}
-
 bool AccessibilityObjectAtspi::registerObject()
 {
     if (!m_path.isNull())
@@ -546,7 +537,7 @@
         return;
 
     m_parent = atspiParent;
-    if (!m_coreObject || m_coreObject->accessibilityIsIgnored() || !root())
+    if (!m_coreObject || m_coreObject->accessibilityIsIgnored())
         return;
 
     AccessibilityAtspi::singleton().parentChanged(*this);

Modified: trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h (288729 => 288730)


--- trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h	2022-01-28 07:03:26 UTC (rev 288729)
+++ trunk/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.h	2022-01-28 07:04:12 UTC (rev 288730)
@@ -159,8 +159,6 @@
 private:
     AccessibilityObjectAtspi(AXCoreObject*, AccessibilityRootAtspi*);
 
-    AccessibilityRootAtspi* root();
-
     Vector<RefPtr<AccessibilityObjectAtspi>> wrapperVector(const Vector<RefPtr<AXCoreObject>>&) const;
     int indexInParent() const;
     void childAdded(AccessibilityObjectAtspi&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to