Notify textChanged if button's children change

When a button's textContent changes, post a textChanged notification. A button's textContent is a child of the button container, but in the accessibility tree button elements cannot have children, so ChildrenChanged previously did not update the button. Bug: 793078 Test: DumpAccessibilityTreeTest.AccessibilityButtonContentChanged Change-Id: I2be389c77763cb60fd2fc9951070370856b0c894 Reviewed-on: https://chromium-review.googlesource.com/1110658 Commit-Queue: James Wallace-Lee <jamwalla@chromium.org> Reviewed-by: Hayato Ito <hayato@chromium.org> Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org> Cr-Commit-Position: refs/heads/master@{#570786}

Notify textChanged if button's children change
When a button's textContent changes, post a textChanged notification. A button's textContent is a child of the button container, but in the accessibility tree button elements cannot have children, so ChildrenChanged previously did not update the button. Bug: 793078 Test: DumpAccessibilityTreeTest.AccessibilityButtonContentChanged Change-Id: I2be389c77763cb60fd2fc9951070370856b0c894 Reviewed-on: https://chromium-review.googlesource.com/1110658 Commit-Queue: James Wallace-Lee <jamwalla@chromium.org> Reviewed-by: Hayato Ito <hayato@chromium.org> Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org> Cr-Commit-Position: refs/heads/master@{#570786}
1a646775 · James Wallace-Lee · Commit Bot · 80be7ab8 · 1a646775 · 1a646775
Commit 1a646775 authored Jun 27, 2018 by James Wallace-Lee Committed by Commit Bot Jun 27, 2018
9 changed files
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -1006,6 +1006,16 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityButton) {
  RunHtmlTest(FILE_PATH_LITERAL("button.html"));
 }

+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
+                       AccessibilityButtonAltChanged) {
+  RunHtmlTest(FILE_PATH_LITERAL("button-alt-changed.html"));
+}
+
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
+                       AccessibilityButtonContentChanged) {
+  RunHtmlTest(FILE_PATH_LITERAL("button-content-changed.html"));
+}
+
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityButtonNameCalc) {
  RunHtmlTest(FILE_PATH_LITERAL("button-name-calc.html"));
 }

--- a/content/test/data/accessibility/html/button-alt-changed-expected-blink.txt
+++ b/content/test/data/accessibility/html/button-alt-changed-expected-blink.txt
+rootWebArea
++genericContainer name='Done'
++button name='After'
--- a/content/test/data/accessibility/html/button-alt-changed.html
+++ b/content/test/data/accessibility/html/button-alt-changed.html
+<!--
+@BLINK-ALLOW:name=*
+@WAIT-FOR:Done
+-->
+<!DOCTYPE html>
+<html>
+<body>
+  <div id="status" aria-label="Working"></div>
+  <button>
+    <img alt="Before"></img>
+  </button>
+
+<script>
+setTimeout(function() {
+  document.querySelector('img').setAttribute("alt", "After");
+  document.getElementById('status').setAttribute('aria-label', 'Done');
+}, 100);
+</script>
+</body>
+</html>
--- a/content/test/data/accessibility/html/button-content-changed-expected-blink.txt
+++ b/content/test/data/accessibility/html/button-content-changed-expected-blink.txt
+rootWebArea
++genericContainer name='Done'
++button name='After '
--- a/content/test/data/accessibility/html/button-content-changed.html
+++ b/content/test/data/accessibility/html/button-content-changed.html
+<!--
+@BLINK-ALLOW:name=*
+@WAIT-FOR:Done
+-->
+<!DOCTYPE html>
+<html>
+<body>
+  <div id="status" aria-label="Working"></div>
+  <button>
+    <p>
+      <div id="txt">Before</div>
+    </p>
+  </button>
+
+<script>
+setTimeout(function() {
+  document.getElementById('txt').textContent = 'After';
+  document.getElementById('status').setAttribute('aria-label', 'Done');
+}, 100);
+</script>
+</body>
+</html>
--- a/third_party/blink/renderer/core/dom/ax_object_cache.h
+++ b/third_party/blink/renderer/core/dom/ax_object_cache.h
@@ -83,6 +83,7 @@ class CORE_EXPORT AXObjectCache
  // Called when a node has just been attached, so we can make sure we have the
  // right subclass of AXObject.
  virtual void UpdateCacheAfterNodeIsAttached(Node*) = 0;
+  virtual void DidInsertChildrenOfNode(Node*) = 0;

  virtual void HandleAttributeChanged(const QualifiedName& attr_name,
                                      Element*) = 0;

--- a/third_party/blink/renderer/core/dom/container_node.cc
+++ b/third_party/blink/renderer/core/dom/container_node.cc
@@ -351,6 +351,9 @@ void ContainerNode::DidInsertNodeVector(
      DispatchChildInsertionEvents(*target_node);
  }
  DispatchSubtreeModifiedEvent();
+
+  if (AXObjectCache* cache = GetDocument().GetOrCreateAXObjectCache())
+    cache->DidInsertChildrenOfNode(this);
 }

 class ContainerNode::AdoptAndInsertBefore {

--- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc
@@ -699,6 +699,20 @@ void AXObjectCacheImpl::UpdateCacheAfterNodeIsAttached(Node* node) {
  MaybeNewRelationTarget(node, obj);
 }

+void AXObjectCacheImpl::DidInsertChildrenOfNode(Node* node) {
+  // If a node is inserted that is a descendant of a leaf node in the
+  // accessibility tree, notify the root of that subtree that its children have
+  // changed.
+  if (!node)
+    return;
+
+  if (AXObject* obj = Get(node)) {
+    TextChanged(obj, node);
+  } else {
+    DidInsertChildrenOfNode(NodeTraversal::Parent(*node));
+  }
+}
+
 void AXObjectCacheImpl::ChildrenChanged(Node* node) {
  ChildrenChanged(Get(node), node);
 }

--- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h
+++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h
@@ -132,6 +132,7 @@ class MODULES_EXPORT AXObjectCacheImpl
  // Called when a node has just been attached, so we can make sure we have the
  // right subclass of AXObject.
  void UpdateCacheAfterNodeIsAttached(Node*) override;
+  void DidInsertChildrenOfNode(Node*) override;

  void HandleAttributeChanged(const QualifiedName& attr_name,
                              Element*) override;