Changeset 286052 in webkit

Timestamp:

Nov 19, 2021, 1:01:37 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r285859) [GTK][WPE] a number of accessibility/* tests crash on GTK and WPE
​https://bugs.webkit.org/show_bug.cgi?id=233221

Patch by Arcady Goldmints-Orlov <Arcady Goldmints-Orlov> on 2021-11-19
Reviewed by Carlos Garcia Campos.

Tools:

Add null checks in the ATK code to ensure AccessibilityUIElement::create()
is not passed a NULL pointer.

• WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:

(WTR::AccessibilityController::focusedElement):

• WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

(WTR::AccessibilityUIElement::getChildren):
(WTR::AccessibilityUIElement::getChildrenWithRange):

LayoutTests:

• platform/glib/TestExpectations:
• platform/glib/accessibility/add-children-pseudo-element-expected.txt:
• platform/glib/accessibility/aria-modal-text-descendants-expected.txt: Added.
• platform/glib/accessibility/table-cell-display-block-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/glib/TestExpectations (modified) (1 diff)
• LayoutTests/platform/glib/accessibility/add-children-pseudo-element-expected.txt (modified) (2 diffs)
• LayoutTests/platform/glib/accessibility/aria-modal-text-descendants-expected.txt (added)
• LayoutTests/platform/glib/accessibility/table-cell-display-block-expected.txt (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-19  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
+
+        REGRESSION(r285859) [GTK][WPE] a number of accessibility/* tests crash on GTK and WPE
+        https://bugs.webkit.org/show_bug.cgi?id=233221
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/glib/TestExpectations:
+        * platform/glib/accessibility/add-children-pseudo-element-expected.txt:
+        * platform/glib/accessibility/aria-modal-text-descendants-expected.txt: Added.
+        * platform/glib/accessibility/table-cell-display-block-expected.txt: Added.
+
 2021-11-18  Frédéric Wang  <fwang@igalia.com>
 

trunk/LayoutTests/platform/glib/TestExpectations

@@ -2014 +2014 @@
 webkit.org/b/160248 fast/text/trailing-word-detection.html [ Failure ]
 webkit.org/b/160249 fast/shrink-wrap/rect-shrink-wrap.html [ ImageOnlyFailure ]
-webkit.org/b/161583 accessibility/auto-fill-types.html [ Failure ]
+webkit.org/b/161583 accessibility/auto-fill-types.html [ Timeout ]
 webkit.org/b/161589 css3/masking/mask-repeat-space-padding.html [ ImageOnlyFailure ]
 webkit.org/b/162815 fast/text/variations/font-face-clamp.html [ ImageOnlyFailure ]

trunk/LayoutTests/platform/glib/accessibility/add-children-pseudo-element-expected.txt

@@ -1 @@
-Language Email
 Make sure that we are updating the render block flow element's children correctly.
 
@@ -6 +5 @@
 
 PASS element.childrenCount is 2
-PASS element.childrenCount is 1
+PASS element.childrenCount === 1
 PASS successfullyParsed is true
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-19  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
+
+        REGRESSION(r285859) [GTK][WPE] a number of accessibility/* tests crash on GTK and WPE
+        https://bugs.webkit.org/show_bug.cgi?id=233221
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add null checks in the ATK code to ensure AccessibilityUIElement::create()
+        is not passed a NULL pointer.
+
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+        (WTR::AccessibilityController::focusedElement):
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        (WTR::AccessibilityUIElement::getChildren):
+        (WTR::AccessibilityUIElement::getChildrenWithRange):
+
 2021-11-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp

@@ -118 +118 @@
     void* root = WKAccessibilityFocusedObject(page);
 
+    if (!ATK_IS_OBJECT(root))
+        return nullptr;
+
     return AccessibilityUIElement::create(static_cast<AtkObject*>(root));
 }

trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

@@ -746 +746 @@
     for (int i = 0; i < count; i++) {
         GRefPtr<AtkObject> child = adoptGRef(atk_object_ref_accessible_child(ATK_OBJECT(m_element.get()), i));
+
+        if (!ATK_IS_OBJECT(child.get()))
+            continue;
+
         children.append(AccessibilityUIElement::create(child.get()));
     }
@@ -757 +761 @@
     for (unsigned i = location; i < end; i++) {
         GRefPtr<AtkObject> child = adoptGRef(atk_object_ref_accessible_child(ATK_OBJECT(m_element.get()), i));
+
+        if (!ATK_IS_OBJECT(child.get()))
+            continue;
+
         children.append(AccessibilityUIElement::create(child.get()));
     }