Attachment 453388 Details for Bug 237272 – Patch

[patch] Patch

wcore-wtr-children-changed.diff (text/plain), 16.15 KB, created by Carlos Garcia Campos on 2022-02-28 06:20:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2022-02-28 06:20:49 PST

Size: 16.15 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3efc4b312f65..6d2c46dd10ea 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,25 @@
>+2022-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [ATSPI] Remove layout tests checking children added/removed notifications
>+        https://bugs.webkit.org/show_bug.cgi?id=237272
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Children changed notifications are not expected by any other tests because other ports don't support them. We
>+        already have unit tests to ensure they work as expected so we can just remove the layout tests and ensure we
>+        don't emit those notifications either.
>+
>+        * accessibility/children-changed-sends-notification-expected.txt: Removed.
>+        * accessibility/children-changed-sends-notification.html: Removed.
>+        * accessibility/gtk/menu-list-unfocused-notifications-expected.txt:
>+        * accessibility/gtk/no-notification-for-unrendered-iframe-children-expected.txt: Removed.
>+        * accessibility/gtk/no-notification-for-unrendered-iframe-children.html: Removed.
>+        * platform/glib/TestExpectations:
>+        * platform/gtk/TestExpectations:
>+        * platform/mac/TestExpectations:
>+        * platform/win/TestExpectations:
>+        * platform/wincairo-wk1/TestExpectations:
>+
> 2022-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [ATSPI] Always expose table cells (layout and CSS) that have rendered text content
>diff --git a/LayoutTests/accessibility/children-changed-sends-notification-expected.txt b/LayoutTests/accessibility/children-changed-sends-notification-expected.txt
>deleted file mode 100644
>index 04c0a361f0f2..000000000000
>--- a/LayoutTests/accessibility/children-changed-sends-notification-expected.txt
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-This test ensures that a notification is being emitted when children are added or removed for an accessibility object
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-Plain text paragraph
>-
>-PARAGRAPH notification: AXChildrenAdded
>-GLOBAL notification: AXChildrenAdded on element with role AXRole: AXParagraph
>-PARAGRAPH notification: AXChildrenRemoved
>-GLOBAL notification: AXChildrenRemoved on element with role AXRole: AXParagraph
>-PASS paragraphNotificationCount is globalNotificationCount
>-PASS globalNotificationCount is 2
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
>-
>diff --git a/LayoutTests/accessibility/children-changed-sends-notification.html b/LayoutTests/accessibility/children-changed-sends-notification.html
>deleted file mode 100644
>index 2fa44cf3b9b5..000000000000
>--- a/LayoutTests/accessibility/children-changed-sends-notification.html
>+++ /dev/null
>@@ -1,74 +0,0 @@
>-<html>
>-<head>
>-<script src="../resources/js-test-pre.js"></script>
>-<script src="../resources/accessibility-helper.js"></script>
>-</head>
>-<body>
>-
>-<p id="description"></p>
>-<p id="paragraph">Plain text paragraph <a id="testLink" href="#">with a link at the end</a></p>
>-
>-<div id="console"></div>
>-
>-<script>
>-window.jsTestIsAsync = true;
>-
>-description("This test ensures that a notification is being emitted when children are added or removed for an accessibility object");
>-
>-function runTest() {
>-    window.paragraphNotificationCount = 0;
>-    window.globalNotificationCount = 0;
>-
>-    if (window.accessibilityController) {
>-        var axWebArea = accessibilityController.rootElement.childAtIndex(0);
>-
>-        // Ensure the accessibility hierarchy is generated.
>-        touchAccessibilityTree(axWebArea);
>-
>-        window.paragraph = axWebArea.childAtIndex(1);
>-        paragraph.addNotificationListener(function(notification) {
>-            paragraphNotificationCount++;
>-            debug("PARAGRAPH notification: " + notification);
>-        });
>-
>-        accessibilityController.addNotificationListener(function(element, notification) {
>-            if (!element.isEqual(paragraph))
>-                return;
>-
>-            globalNotificationCount++;
>-            debug("GLOBAL notification: " + notification + " on element with role " + element.role);
>-        });
>-    }
>-
>-    var par = document.getElementById('paragraph');
>-    window.newChild = document.createElement('button');
>-    par.appendChild(newChild);
>-
>-    // Ensure the new child is added.
>-    touchAccessibilityTree(axWebArea);
>-
>-    window.setTimeout(function() {
>-        var link = document.getElementById('testLink');
>-        link.style.display = 'none';
>-
>-        // Ensure the accessibility hierarchy is regenerated.
>-        touchAccessibilityTree(axWebArea);
>-
>-        shouldBe("paragraphNotificationCount", "globalNotificationCount");
>-        shouldBe("globalNotificationCount", "2");
>-
>-        if (window.accessibilityController) {
>-            paragraph.removeNotificationListener();
>-            accessibilityController.removeNotificationListener();
>-        }
>-
>-        finishJSTest();
>-    }, 0);
>-}
>-
>-runTest();
>-</script>
>-
>-<script src="../resources/js-test-post.js"></script>
>-</body>
>-</html>
>diff --git a/LayoutTests/accessibility/gtk/menu-list-unfocused-notifications-expected.txt b/LayoutTests/accessibility/gtk/menu-list-unfocused-notifications-expected.txt
>index 5e4a0f1cbc77..b2873ba3d451 100644
>--- a/LayoutTests/accessibility/gtk/menu-list-unfocused-notifications-expected.txt
>+++ b/LayoutTests/accessibility/gtk/menu-list-unfocused-notifications-expected.txt
>@@ -16,7 +16,6 @@ Changing selected item in non-focused combobox.
> AXSelectedChildrenChanged: AXRole: AXComboBox
> Focused element is: AXRole: AXButton
> 
>-AXChildrenAdded: AXRole: AXWebArea
> AXLoadComplete: AXRole: AXWebArea
> AXElementBusyChanged: AXRole: AXWebArea
> PASS successfullyParsed is true
>diff --git a/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children-expected.txt b/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children-expected.txt
>deleted file mode 100644
>index 40d57aa4cdea..000000000000
>--- a/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children-expected.txt
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-This test ensures that a children-changed notification is not emitted for children of not-yet-rendered nested iframes.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-
>-AXChildrenAdded on AXTitle: inner body (AXTitle: inner iframe)
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
>-
>diff --git a/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children.html b/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children.html
>deleted file mode 100644
>index aab4bdb2d7ca..000000000000
>--- a/LayoutTests/accessibility/gtk/no-notification-for-unrendered-iframe-children.html
>+++ /dev/null
>@@ -1,50 +0,0 @@
>-<html>
>-<head>
>-<script src="../../resources/js-test-pre.js"></script>
>-<script src="../../resources/accessibility-helper.js"></script>
>-</head>
>-<body aria-label="outer body">
>-<p id="description"></p>
>-<iframe aria-label="outer iframe" id="iframe"></iframe>
>-<div id="console"></div>
>-<script>
>-window.jsTestIsAsync = true;
>-
>-description("This test ensures that a children-changed notification is not emitted for children of not-yet-rendered nested iframes.");
>-function runTest() {
>-
>-    if (window.accessibilityController) {
>-        var axWebArea = accessibilityController.rootElement.childAtIndex(0);
>-
>-        // Generate the hierarchy before registering a listener so that we only see new notifications.
>-        touchAccessibilityTree(axWebArea);
>-
>-        accessibilityController.addNotificationListener(function(element, notification, child) {
>-            if (notification == "AXChildrenAdded" && element.role == "AXRole: AXGroup")
>-                debug(notification + " on " + element.title + " (" + (child ? child.title : "null") + ")");
>-        });
>-    }
>-
>-    // Write content in the outer iframe, including an inner iframe. The latter should not emit a notification.
>-    var iframe = document.getElementById("iframe");
>-    var doc = iframe.contentWindow.document;
>-    doc.open();
>-    doc.write("<html><body aria-label='inner body'><iframe aria-label='inner iframe' src='about:config'></body></html>");
>-    doc.close();
>-
>-    // Re-generate the hierarchy to trigger the notifications.
>-    touchAccessibilityTree(axWebArea);
>-
>-    window.setTimeout(function() {
>-        if (window.accessibilityController) {
>-            accessibilityController.removeNotificationListener();
>-        }
>-
>-        finishJSTest();
>-    }, 0);
>-}
>-runTest();
>-</script>
>-<script src="../../resources/js-test-post.js"></script>
>-</body>
>-</html>
>diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
>index 88571731da77..98d215ad36d9 100644
>--- a/LayoutTests/platform/glib/TestExpectations
>+++ b/LayoutTests/platform/glib/TestExpectations
>@@ -413,7 +413,6 @@ webkit.org/b/232255 accessibility/math-has-non-presentational-children.html [ Fa
> webkit.org/b/232256 accessibility/auto-fill-crash.html [ Timeout ]
> 
> # Tests failing with ATSPI implementation.
>-webkit.org/b/235941 accessibility/children-changed-sends-notification.html [ Failure ]
> webkit.org/b/235941 accessibility/select-element-at-index.html [ Failure ]
> 
> #////////////////////////////////////////////////////////////////////////////////////////
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 210f39ba7023..af1a50c27184 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -135,7 +135,6 @@ webkit.org/b/223862 accessibility/gtk/text-for-range-with-link.html [ Failure ]
> accessibility/model-element-attributes.html [ Skip ]
> 
> # Tests failing with ATSPI implementation.
>-webkit.org/b/235941 accessibility/gtk/no-notification-for-unrendered-iframe-children.html [ Failure ]
> webkit.org/b/235941 accessibility/gtk/text-at-offset-embedded-objects.html [ Failure ]
> webkit.org/b/235941 accessibility/gtk/text-at-offset-special-chars.html [ Failure ]
> webkit.org/b/235941 accessibility/gtk/caret-offsets.html [ Timeout ]
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 5243395992f2..577333da8e0a 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -115,7 +115,6 @@ model-element/model-element-interactive-dragging.html [ Skip ]
> accessibility/aria-checkbox-sends-notification.html
> accessibility/aria-switch-sends-notification.html
> accessibility/combo-box-collapsed-selection-changed.html
>-accessibility/children-changed-sends-notification.html
> accessibility/multiselect-list-reports-active-option.html
> 
> # Need to implement AccessibilityUIElement::clearSelectedChildren()
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index 142de5251877..bc192e16109a 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -1550,7 +1550,6 @@ webkit.org/b/149177 accessibility/ax-value-with-search.html [ Skip ]
> # Accessibility tests for notifications that don't exist or aren't needed on Mac OS X (or Windows)
> accessibility/aria-checkbox-sends-notification.html [ Skip ]
> accessibility/combo-box-collapsed-selection-changed.html [ Skip ]
>-accessibility/children-changed-sends-notification.html [ Skip ]
> accessibility/menu-list-sends-change-notification.html [ Skip ]
> accessibility/multiselect-list-reports-active-option.html [ Skip ]
> 
>diff --git a/LayoutTests/platform/wincairo-wk1/TestExpectations b/LayoutTests/platform/wincairo-wk1/TestExpectations
>index eb2074a4deeb..4c2024d87e0c 100644
>--- a/LayoutTests/platform/wincairo-wk1/TestExpectations
>+++ b/LayoutTests/platform/wincairo-wk1/TestExpectations
>@@ -53,7 +53,6 @@ webkit.org/b/149177 accessibility/ax-value-with-search.html [ Skip ]
> # Accessibility tests for notifications that don't exist or aren't needed on Mac OS X (or Windows)
> accessibility/aria-checkbox-sends-notification.html [ Skip ]
> accessibility/combo-box-collapsed-selection-changed.html [ Skip ]
>-accessibility/children-changed-sends-notification.html [ Skip ]
> accessibility/menu-list-sends-change-notification.html [ Skip ]
> accessibility/multiselect-list-reports-active-option.html [ Skip ]
> 
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1173dab8467..05d2c6cc51bd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2022-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [ATSPI] Remove layout tests checking children added/removed notifications
>+        https://bugs.webkit.org/show_bug.cgi?id=237272
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not send children-changed notifications to WTR observers.
>+
>+        * accessibility/atspi/AccessibilityAtspi.cpp:
>+        (WebCore::AccessibilityAtspi::childrenChanged):
>+        (WebCore::AccessibilityAtspi::notifyChildrenChanged const): Deleted.
>+        * accessibility/atspi/AccessibilityAtspi.h:
>+
> 2022-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [ATSPI] Always expose table cells (layout and CSS) that have rendered text content
>diff --git a/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp b/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp
>index 1a5ff1a37611..12bcfc6f4e04 100644
>--- a/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp
>+++ b/Source/WebCore/accessibility/atspi/AccessibilityAtspi.cpp
>@@ -426,10 +426,6 @@ void AccessibilityAtspi::parentChanged(AccessibilityRootAtspi& rootObject)
> 
> void AccessibilityAtspi::childrenChanged(AccessibilityObjectAtspi& atspiObject, AccessibilityObjectAtspi& child, ChildrenChanged change)
> {
>-#if ENABLE(DEVELOPER_MODE)
>-    notifyChildrenChanged(atspiObject, child, change);
>-#endif
>-
>     if (!m_connection)
>         return;
> 
>@@ -437,7 +433,6 @@ void AccessibilityAtspi::childrenChanged(AccessibilityObjectAtspi& atspiObject,
>     if (m_clients.isEmpty())
>         return;
> 
>-
>     g_dbus_connection_emit_signal(m_connection.get(), nullptr, atspiObject.path().utf8().data(), "org.a11y.atspi.Event.Object", "ChildrenChanged",
>         g_variant_new("(siiv(so))", change == ChildrenChanged::Added ? "add" : "remove", child.indexInParentForChildrenChanged(change),
>         0, g_variant_new("(so)", uniqueName(), child.path().utf8().data()), uniqueName(), atspiObject.path().utf8().data()), nullptr);
>@@ -452,7 +447,6 @@ void AccessibilityAtspi::childrenChanged(AccessibilityRootAtspi& rootObject, Acc
>     if (m_clients.isEmpty())
>         return;
> 
>-
>     g_dbus_connection_emit_signal(m_connection.get(), nullptr, rootObject.path().utf8().data(), "org.a11y.atspi.Event.Object", "ChildrenChanged",
>         g_variant_new("(siiv(so))", change == ChildrenChanged::Added ? "add" : "remove", 0,
>         0, g_variant_new("(so)", uniqueName(), child.path().utf8().data()), uniqueName(), rootObject.path().utf8().data()), nullptr);
>@@ -904,13 +898,6 @@ void AccessibilityAtspi::notifyTextCaretMoved(AccessibilityObjectAtspi& atspiObj
>         observer(atspiObject, "AXTextCaretMoved", caretOffset);
> }
> 
>-void AccessibilityAtspi::notifyChildrenChanged(AccessibilityObjectAtspi& atspiObject, AccessibilityObjectAtspi& child, ChildrenChanged change) const
>-{
>-    const char* notification = change == ChildrenChanged::Added ? "AXChildrenAdded" : "AXChildrenRemoved";
>-    for (const auto& observer : m_notificationObservers.values())
>-        observer(atspiObject, notification, child);
>-}
>-
> void AccessibilityAtspi::notifyValueChanged(AccessibilityObjectAtspi& atspiObject) const
> {
>     for (const auto& observer : m_notificationObservers.values())
>diff --git a/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h b/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h
>index 336731ab691b..b2ec474a4824 100644
>--- a/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h
>+++ b/Source/WebCore/accessibility/atspi/AccessibilityAtspi.h
>@@ -116,7 +116,6 @@ private:
>     void notifyMenuSelectionChanged(AccessibilityObjectAtspi&) const;
>     void notifyTextChanged(AccessibilityObjectAtspi&) const;
>     void notifyTextCaretMoved(AccessibilityObjectAtspi&, unsigned) const;
>-    void notifyChildrenChanged(AccessibilityObjectAtspi&, AccessibilityObjectAtspi&, ChildrenChanged) const;
>     void notifyValueChanged(AccessibilityObjectAtspi&) const;
>     void notifyLoadEvent(AccessibilityObjectAtspi&, const CString&) const;
> #endif

Flags:

aperez: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 237272: 453388