AX: Fix multiple-label-input test in ITM mode

https://bugs.webkit.org/show_bug.cgi?id=260174 rdar://113872525 Reviewed by Andres Gonzalez. This patch resolves an issue where innerHTML and innerText changes to labels were not updating their corresponding input element's AX title. * LayoutTests/accessibility-isolated-tree/TestExpectations * LayoutTests/platform/glib/accessibility/multiple-label-input-expected.txt * LayoutTests/accessibility/multiple-label-input.html * LayoutTests/accessibility/multiple-label-input-expected.txt: Added check for using innerHTML—only checked for innerText functionality previously. * Source/WebCore/accessibility/AXObjectCache.cpp: (WebCore::AXObjectCache::updateIsolatedTree): If static text changes and its parent is a <label>, update the corresponding control. * Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp: (WebCore::AXIsolatedTree::updateNodeAndDependentProperties): Check if a label is being modified (using innerText). If it is, update the corresponding control. Canonical link: https://commits.webkit.org/266919@main
WebKit · Aug 15, 2023 · 28bfc96 · 28bfc96
1 parent 0c02598
commit 28bfc96
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/LayoutTests/accessibility-isolated-tree/TestExpectations b/LayoutTests/accessibility-isolated-tree/TestExpectations
@@ -9,9 +9,6 @@ accessibility/frame-disconnect-textmarker-cache-crash.html [ Timeout ]
 accessibility/mac/combobox-activedescendant-notifications.html [ Timeout ]
 accessibility/mac/relationships-in-frames.html [ Timeout ]
 
-# Times out because `innerText` changes on linked <label>s don't update cached AXTitle value.
-accessibility/multiple-label-input.html [ Timeout ]
-
 # Text failures
 accessibility/dialog-showModal.html [ Failure ]
 accessibility/dynamically-ignored-canvas.html [ Failure ]

diff --git a/LayoutTests/accessibility/multiple-label-input-expected.txt b/LayoutTests/accessibility/multiple-label-input-expected.txt
@@ -12,8 +12,12 @@ document.getElementById('label3').innerText = 'choice';
 	AXTitle: Enter choice
 	AXDescription:
 	AXHelp:
+document.getElementById('label3').innerHTML = 'decision';
+	AXTitle: Enter decision
+	AXDescription:
+	AXHelp:
 
 PASS successfullyParsed is true
 
 TEST COMPLETE
- Enter choice
+ Enter decision
diff --git a/LayoutTests/accessibility/multiple-label-input.html b/LayoutTests/accessibility/multiple-label-input.html
@@ -36,6 +36,13 @@
         });
         output += `${newText}\n`;
 
+        output += evalAndReturn("document.getElementById('label3').innerHTML = 'decision';");
+        await waitFor(() => {
+            newText = platformTextAlternatives(input);
+            return newText.includes("decision");
+        });
+        output += `${newText}\n`;
+
         debug(output);
         finishJSTest();
     }, 0);

diff --git a/LayoutTests/platform/glib/accessibility/multiple-label-input-expected.txt b/LayoutTests/platform/glib/accessibility/multiple-label-input-expected.txt
@@ -9,8 +9,11 @@ document.getElementById('label2').remove();
 document.getElementById('label3').innerText = 'choice';
 	AXTitle: Enter choice
 	AXDescription:
+document.getElementById('label3').innerHTML = 'decision';
+	AXTitle: Enter decision
+	AXDescription:
 
 PASS successfullyParsed is true
 
 TEST COMPLETE
- Enter choice
+ Enter decision
diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp
@@ -4083,11 +4083,17 @@ void AXObjectCache::updateIsolatedTree(const Vector<std::pair<RefPtr<Accessibili
         case AXPressedStateChanged:
         case AXRowSpanChanged:
         case AXSelectedChildrenChanged:
-        case AXTextChanged:
         case AXTextSecurityChanged:
         case AXValueChanged:
             updateNode(notification.first);
             break;
+        case AXTextChanged:
+            updateNode(notification.first);
+            if (RefPtr axParent = notification.first->parentObject(); axParent && axParent->isLabel()) {
+                if (RefPtr correspondingControl = axParent->correspondingControlForLabelElement())
+                    updateNode(correspondingControl.get());
+            }
+            break;
         case AXLanguageChanged:
         case AXRowCountChanged:
             updateNode(notification.first);

diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
@@ -611,6 +611,9 @@ void AXIsolatedTree::updateNodeAndDependentProperties(AccessibilityObject& axObj
 
     updateNode(axObject);
 
+    if (RefPtr correspondingControl = axObject.isLabel() ? axObject.correspondingControlForLabelElement() : nullptr)
+        updateNode(*correspondingControl);
+
     // When a row gains or loses cells, the column count of the table can change.
     bool updateTableAncestorColumns = is<AccessibilityTableRow>(axObject);
     for (auto* ancestor = axObject.parentObject(); ancestor; ancestor = ancestor->parentObject()) {