Make use of new faster Blink AX live region APIs.

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 42 matching lines @@
 // |ancestor| is the *first* ancestor that isn't marked as
 // accessibilityIsIgnored().
 bool IsParentUnignoredOf(WebAXObject ancestor,
                          WebAXObject child) {
   WebAXObject parent = child.parentObject();
   while (!parent.isDetached() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
 }
 
-bool IsTrue(std::string html_value) {
-  return LowerCaseEqualsASCII(html_value, "true");
-}
-
 std::string GetEquivalentAriaRoleString(const ui::AXRole role) {
   switch (role) {
     case ui::AX_ROLE_ARTICLE:
       return "article";
     case ui::AX_ROLE_BANNER:
       return "banner";
     case ui::AX_ROLE_BUTTON:
       return "button";
     case ui::AX_ROLE_COMPLEMENTARY:
       return "complementary";
@@ skipping 229 matching lines @@
   if (dst->role == ui::AX_ROLE_LIST_BOX_OPTION &&
       src.isSelectedOptionActive()) {
     dst->state |= (1 << ui::AX_STATE_FOCUSED);
   }
 
   if (src.canvasHasFallbackContent())
     dst->AddBoolAttribute(ui::AX_ATTR_CANVAS_HAS_FALLBACK, true);
 
   WebNode node = src.node();
   bool is_iframe = false;
-  std::string live_atomic;
-  std::string live_busy;
-  std::string live_status;
-  std::string live_relevant;
 
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
     is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
 
     if (LowerCaseEqualsASCII(element.getAttribute("aria-expanded"), "true"))
       dst->state |= (1 << ui::AX_STATE_EXPANDED);
 
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
@@ skipping 34 matching lines @@
     // ARIA role.
     if (element.hasAttribute("role")) {
       dst->AddStringAttribute(ui::AX_ATTR_ROLE,
                               UTF16ToUTF8(element.getAttribute("role")));
     } else {
       std::string role = GetEquivalentAriaRoleString(dst->role);
       if (!role.empty())
         dst->AddStringAttribute(ui::AX_ATTR_ROLE, role);
     }
 
-    // Live region attributes
-    live_atomic = UTF16ToUTF8(element.getAttribute("aria-atomic"));
-    live_busy = UTF16ToUTF8(element.getAttribute("aria-busy"));
-    live_status = UTF16ToUTF8(element.getAttribute("aria-live"));
-    live_relevant = UTF16ToUTF8(element.getAttribute("aria-relevant"));
-
     // Browser plugin (used in a <webview>).
     if (node_to_browser_plugin_instance_id_map_) {
       BrowserPlugin* browser_plugin = BrowserPlugin::GetFromNode(element);
       if (browser_plugin) {
         (*node_to_browser_plugin_instance_id_map_)[dst->id] =
             browser_plugin->browser_plugin_instance_id();
         dst->AddBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST, true);
       }
     }
   }
 
-  // Walk up the parent chain to set live region attributes of containers
-  std::string container_live_atomic;
-  std::string container_live_busy;
-  std::string container_live_status;
-  std::string container_live_relevant;
-  WebAXObject container_accessible = src;
-  while (!container_accessible.isDetached()) {
-    WebNode container_node = container_accessible.node();
-    if (!container_node.isNull() && container_node.isElementNode()) {
-      WebElement container_elem = container_node.to<WebElement>();
-      if (container_elem.hasAttribute("aria-atomic") &&
-          container_live_atomic.empty()) {
-        container_live_atomic =
-            UTF16ToUTF8(container_elem.getAttribute("aria-atomic"));
-      }
-      if (container_elem.hasAttribute("aria-busy") &&
-          container_live_busy.empty()) {
-        container_live_busy =
-            UTF16ToUTF8(container_elem.getAttribute("aria-busy"));
-      }
-      if (container_elem.hasAttribute("aria-live") &&
-          container_live_status.empty()) {
-        container_live_status =
-            UTF16ToUTF8(container_elem.getAttribute("aria-live"));
-      }
-      if (container_elem.hasAttribute("aria-relevant") &&
-          container_live_relevant.empty()) {
-        container_live_relevant =
-            UTF16ToUTF8(container_elem.getAttribute("aria-relevant"));
-      }
-    }
-    container_accessible = container_accessible.parentObject();
-  }
-
-  if (!live_atomic.empty())
-    dst->AddBoolAttribute(ui::AX_ATTR_LIVE_ATOMIC, IsTrue(live_atomic));
-  if (!live_busy.empty())
-    dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, IsTrue(live_busy));
-  if (!live_status.empty())
-    dst->AddStringAttribute(ui::AX_ATTR_LIVE_STATUS, live_status);
-  if (!live_relevant.empty())
-    dst->AddStringAttribute(ui::AX_ATTR_LIVE_RELEVANT, live_relevant);
-
-  if (!container_live_atomic.empty()) {
+  if (src.isInLiveRegion()) {
+    dst->AddBoolAttribute(ui::AX_ATTR_LIVE_ATOMIC, src.liveRegionAtomic());
+    dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, src.liveRegionBusy());
+    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,
-                          IsTrue(container_live_atomic));
-  }
-  if (!container_live_busy.empty()) {
+                          src.containerLiveRegionAtomic());
     dst->AddBoolAttribute(ui::AX_ATTR_CONTAINER_LIVE_BUSY,
-                          IsTrue(container_live_busy));
-  }
-  if (!container_live_status.empty()) {
+                          src.containerLiveRegionBusy());
     dst->AddStringAttribute(ui::AX_ATTR_CONTAINER_LIVE_STATUS,
-                            container_live_status);
-  }
-  if (!container_live_relevant.empty()) {
+                            UTF16ToUTF8(src.containerLiveRegionStatus()));
     dst->AddStringAttribute(ui::AX_ATTR_CONTAINER_LIVE_RELEVANT,
-                            container_live_relevant);
+                            UTF16ToUTF8(src.containerLiveRegionRelevant()));
   }
 
   if (dst->role == ui::AX_ROLE_PROGRESS_INDICATOR ||
       dst->role == ui::AX_ROLE_SCROLL_BAR ||
       dst->role == ui::AX_ROLE_SLIDER ||
       dst->role == ui::AX_ROLE_SPIN_BUTTON) {
     dst->AddFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE, src.valueForRange());
     dst->AddFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE,
                            src.maxValueForRange());
     dst->AddFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE,
@@ skipping 152 matching lines @@
     AddIntListAttributeFromWebObjects(ui::AX_ATTR_OWNS_IDS, owns, dst);
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content