Changeset 275664 in webkit

Timestamp:

Apr 8, 2021, 11:23:02 AM (6 years ago)

Author:

Andres Gonzalez

Message:

VoiceOver does not echo text insertions and deletions when a contenteditable div has a non editable descendant element with a content editable child
​https://bugs.webkit.org/show_bug.cgi?id=223818

Reviewed by Chris Fleizach.

Source/WebCore:

Test: accessibility/nested-textareas-value-changed-notifications.html

AXObjectCache::textChanged now only notifies the closest non-native text
control of value changes. This avoid the problem of multiple value
changed notifications in a row when there are nested text areas.
Removed AccessibilityRenderObject::textChanged and moved that
functionality to AXObjectCache::textChanged, where it belongs.

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::textChanged):

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityObjectInterface.h:
• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::textChanged): Deleted.

• accessibility/AccessibilityRenderObject.h:
• accessibility/isolatedtree/AXIsolatedObject.cpp:

(WebCore::AXIsolatedObject::textChanged): Deleted.

• accessibility/isolatedtree/AXIsolatedObject.h:

LayoutTests:

• accessibility/nested-textareas-value-changed-notifications-expected.txt: Added.
• accessibility/nested-textareas-value-changed-notifications.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/nested-textareas-value-changed-notifications-expected.txt (added)
• LayoutTests/accessibility/nested-textareas-value-changed-notifications.html (added)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityObjectInterface.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-08  Andres Gonzalez  <andresg_22@apple.com>
+
+        VoiceOver does not echo text insertions and deletions when a contenteditable div has a non editable descendant element with a content editable child
+        https://bugs.webkit.org/show_bug.cgi?id=223818
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/nested-textareas-value-changed-notifications-expected.txt: Added.
+        * accessibility/nested-textareas-value-changed-notifications.html: Added.
+
 2021-04-08  Sihui Liu  <sihui_liu@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -981 +981 @@
 accessibility/mac/aria-details.html [ Skip ]
 accessibility/mac/aria-errormessage.html [ Skip ]
+accessibility/nested-textareas-value-changed-notifications.html [ Skip ]
 
 # <rdar://problem/61066929> [ Stress GC ] flaky JSC::ExceptionScope::assertNoException crash under WebCore::ReadableStreamDefaultController

trunk/LayoutTests/platform/win/TestExpectations

@@ -3451 +3451 @@
 accessibility/inline-continuations.html [ Skip ]
 accessibility/list-detection.html [ Skip ]
+accessibility/nested-textareas-value-changed-notifications.html [ Skip ]
 accessibility/minimal-table-with-aria-is-data-table.html [ Failure ]
 accessibility/presentation-role-iframe.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-08  Andres Gonzalez  <andresg_22@apple.com>
+
+        VoiceOver does not echo text insertions and deletions when a contenteditable div has a non editable descendant element with a content editable child
+        https://bugs.webkit.org/show_bug.cgi?id=223818
+
+        Reviewed by Chris Fleizach.
+
+        Test: accessibility/nested-textareas-value-changed-notifications.html
+
+        AXObjectCache::textChanged now only notifies the closest non-native text
+        control of value changes. This avoid the problem of multiple value
+        changed notifications in a row when there are nested text areas.
+        Removed AccessibilityRenderObject::textChanged and moved that
+        functionality to AXObjectCache::textChanged, where it belongs.
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::textChanged):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::textChanged): Deleted.
+        * accessibility/AccessibilityRenderObject.h:
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::textChanged): Deleted.
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+
 2021-04-08  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -980 +980 @@
 }
 
-void AXObjectCache::textChanged(AccessibilityObject* obj)
-{
-    if (!obj)
-        return;
-
-    bool parentAlreadyExists = obj->parentObjectIfExists();
-    obj->textChanged();
-    postNotification(obj, obj->document(), AXObjectCache::AXTextChanged);
-    if (parentAlreadyExists)
-        obj->notifyIfIgnoredValueChanged();
+void AXObjectCache::textChanged(AccessibilityObject* object)
+{
+    AXTRACE("AXObjectCache::textChanged");
+    AXLOG(object);
+
+    if (!object)
+        return;
+
+    // If this element supports ARIA live regions, or is part of a region with an ARIA editable role,
+    // then notify the AT of changes.
+    bool notifiedNonNativeTextControl = false;
+    for (auto* parent = object; parent; parent = parent->parentObject()) {
+        if (parent->supportsLiveRegion())
+            postLiveRegionChangeNotification(parent);
+
+        if (!notifiedNonNativeTextControl && parent->isNonNativeTextControl()) {
+            postNotification(parent, parent->document(), AXValueChanged);
+            notifiedNonNativeTextControl = true;
+        }
+    }
+
+    postNotification(object, object->document(), AXTextChanged);
+
+    if (object->parentObjectIfExists())
+        object->notifyIfIgnoredValueChanged();
 }
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -483 +483 @@
 
     void childrenChanged() override { }
-    void textChanged() override { }
     void updateAccessibilityRole() override { }
     const AccessibilityChildrenVector& children(bool updateChildrenIfNeeded = true) override;
@@ -792 +791 @@
     bool allowsTextRanges() const;
     unsigned getLengthForTextRange() const;
-
     String innerHTML() const override;
     String outerHTML() const override;

trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h

@@ -1223 +1223 @@
 
     virtual void childrenChanged() = 0;
-    virtual void textChanged() = 0;
     virtual void updateAccessibilityRole() = 0;
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -3158 +3158 @@
 }
 
-void AccessibilityRenderObject::textChanged()
-{
-    // If this element supports ARIA live regions, or is part of a region with an ARIA editable role,
-    // then notify the AT of changes.
-    AXObjectCache* cache = axObjectCache();
-    if (!cache)
-        return;
-    
-    for (RenderObject* renderParent = renderer(); renderParent; renderParent = renderParent->parent()) {
-        AccessibilityObject* parent = cache->get(renderParent);
-        if (!parent)
-            continue;
-        
-        if (parent->supportsLiveRegion())
-            cache->postLiveRegionChangeNotification(parent);
-
-        if (parent->isNonNativeTextControl())
-            cache->postNotification(renderParent, AXObjectCache::AXValueChanged);
-    }
-}
-
 void AccessibilityRenderObject::clearChildren()
 {

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -152 +152 @@
     AccessibilityOrientation orientation() const override;
 
-    void textChanged() override;
     void addChildren() override;
     bool canHaveChildren() const override;

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp

@@ -2118 +2118 @@
 }
 
-void AXIsolatedObject::textChanged()
-{
-    ASSERT_NOT_REACHED();
-}
-
 void AXIsolatedObject::updateAccessibilityRole()
 {

trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h

@@ -588 +588 @@
     ScrollView* scrollViewAncestor() const override;
     void childrenChanged() override;
-    void textChanged() override;
     void updateAccessibilityRole() override;
     void addChildren() override;