Fix live regions on Mac OS X.

We were returning an empty string for AXARIALive for nodes inside of a live region, and that was confusing VoiceOver. BUG=440934 Review URL: https://codereview.chromium.org/795363002 Cr-Commit-Position: refs/heads/master@{#308029}

Fix live regions on Mac OS X.
We were returning an empty string for AXARIALive for nodes inside of a live region, and that was confusing VoiceOver. BUG=440934 Review URL: https://codereview.chromium.org/795363002 Cr-Commit-Position: refs/heads/master@{#308029}
8f1a92f0 · dmazzoni · Commit bot · 8a61bd41 · 8f1a92f0 · 8f1a92f0
Commit 8f1a92f0 authored Dec 11, 2014 by dmazzoni Committed by Commit bot Dec 12, 2014
6 changed files
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -475,6 +475,11 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaLive) {
  RunTest(FILE_PATH_LITERAL("aria-live.html"));
 }
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
+                       AccessibilityAriaLiveWithContent) {
+  RunTest(FILE_PATH_LITERAL("aria-live-with-content.html"));
+}
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaLog) {
  RunTest(FILE_PATH_LITERAL("aria-log.html"));
 }

--- a/content/renderer/accessibility/blink_ax_tree_source.cc
+++ b/content/renderer/accessibility/blink_ax_tree_source.cc
@@ -385,8 +385,10 @@ void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
    dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, src.liveRegionBusy());
    if (src.liveRegionBusy())
      dst->state |= (1 << ui::AX_STATE_BUSY);
-    dst->AddStringAttribute(ui::AX_ATTR_LIVE_STATUS,
+    if (!src.liveRegionStatus().isEmpty()) {
-                            UTF16ToUTF8(src.liveRegionStatus()));
+      dst->AddStringAttribute(ui::AX_ATTR_LIVE_STATUS,
+                              UTF16ToUTF8(src.liveRegionStatus()));
+    }
    dst->AddStringAttribute(ui::AX_ATTR_LIVE_RELEVANT,
                            UTF16ToUTF8(src.liveRegionRelevant()));
    dst->AddBoolAttribute(ui::AX_ATTR_CONTAINER_LIVE_ATOMIC,

--- a/content/test/data/accessibility/aria-live-with-content-expected-android.txt
+++ b/content/test/data/accessibility/aria-live-with-content-expected-android.txt
+#<skip -- need to generate>
--- a/content/test/data/accessibility/aria-live-with-content-expected-mac.txt
+++ b/content/test/data/accessibility/aria-live-with-content-expected-mac.txt
+AXWebArea
+    AXGroup AXSubrole=AXApplicationMarquee
+        AXStaticText AXValue='Off'
+    AXGroup AXSubrole=AXApplicationMarquee AXARIALive='polite'
+        AXStaticText AXValue='Polite'
+    AXGroup AXSubrole=AXApplicationMarquee AXARIALive='assertive'
+        AXStaticText AXValue='Assertive'
--- a/content/test/data/accessibility/aria-live-with-content-expected-win.txt
+++ b/content/test/data/accessibility/aria-live-with-content-expected-win.txt
+#<skip -- need to generate>
--- a/content/test/data/accessibility/aria-live-with-content.html
+++ b/content/test/data/accessibility/aria-live-with-content.html
+<!--
+@MAC-ALLOW:AXSubrole*
+@MAC-ALLOW-EMPTY:AXARIALive*
+@WIN-ALLOW:live*
+@WIN-ALLOW:container*
+@WIN-ALLOW:BUSY*
+-->
+<!DOCTYPE html>
+<html>
+  <body>
+    <div role="marquee" aria-live="off">
+      Off
+    </div>
+    <div role="marquee" aria-live="polite">
+      Polite
+    </div>
+    <div role="marquee" aria-live="assertive">
+      Assertive
+    </div>
+  </body>
+</html>