Fix issue with font family and language in accessibility tree

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 <stddef.h>
 
 #include <set>
 
@@ skipping 36 matching lines @@
 using blink::WebNode;
 using blink::WebPlugin;
 using blink::WebPluginContainer;
 using blink::WebVector;
 using blink::WebView;
 
 namespace content {
 
 namespace {
 
+WebAXObject ParentObjectUnignored(WebAXObject child) {
+  WebAXObject parent = child.parentObject();
+  while (!parent.isDetached() && parent.accessibilityIsIgnored())
+    parent = parent.parentObject();
+  return parent;
+}
+
 // Returns true if |ancestor| is the first unignored parent of |child|,
 // which means that when walking up the parent chain from |child|,
 // |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();
+  WebAXObject parent = ParentObjectUnignored(child);
   return parent.equals(ancestor);
 }
 
 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:
@@ skipping 276 matching lines @@
     dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE, src.colorValue());
 
 
   // Text attributes.
   if (src.backgroundColor())
     dst->AddIntAttribute(ui::AX_ATTR_BACKGROUND_COLOR, src.backgroundColor());
 
   if (src.color())
     dst->AddIntAttribute(ui::AX_ATTR_COLOR, src.color());
 
+  WebAXObject parent = ParentObjectUnignored(src);
   if (src.fontFamily().length()) {
-    WebAXObject parent = src.parentObject();
     if (parent.isNull() || parent.fontFamily() != src.fontFamily())
       dst->AddStringAttribute(ui::AX_ATTR_FONT_FAMILY, src.fontFamily().utf8());
   }
 
   // Font size is in pixels.
   if (src.fontSize())
     dst->AddFloatAttribute(ui::AX_ATTR_FONT_SIZE, src.fontSize());
 
   if (src.ariaCurrentState()) {
     dst->AddIntAttribute(ui::AX_ATTR_ARIA_CURRENT_STATE,
@@ skipping 67 matching lines @@
 
   if (src.canSetValueAttribute())
     dst->AddBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE, true);
 
   if (src.hasComputedStyle()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_DISPLAY, src.computedStyleDisplay().utf8());
   }
 
   if (src.language().length()) {
-    WebAXObject parent = src.parentObject();
     if (parent.isNull() || parent.language() != src.language())
       dst->AddStringAttribute(ui::AX_ATTR_LANGUAGE, src.language().utf8());
   }
 
   if (src.keyboardShortcut().length()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_SHORTCUT,
         src.keyboardShortcut().utf8());
   }
 
@@ skipping 283 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->document();
   if (!document.isNull())
     return document.accessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content