Implemented the reporting of text style and language information on Windows.

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 120 matching lines @@
   }
   return false;
 }
 
 AXContentTreeData BlinkAXTreeSource::GetTreeData() const {
   AXContentTreeData tree_data;
 
   blink::WebDocument document = BlinkAXTreeSource::GetMainDocument();
   const blink::WebAXObject& root = GetRoot();
 
+  tree_data.doctype = "html";
+  tree_data.loaded = root.isLoaded();
+  tree_data.loading_progress = root.estimatedLoadingProgress();
+  tree_data.mimetype = document.isXHTMLDocument() ? "text/xhtml" : "text/html";
   tree_data.title = document.title().utf8();
   tree_data.url = document.url().string().utf8();
-  tree_data.mimetype = document.isXHTMLDocument() ? "text/xhtml" : "text/html";
-  tree_data.loaded = root.isLoaded();
-  tree_data.loading_progress = root.estimatedLoadingProgress();
-  tree_data.doctype = "html";
 
   WebAXObject focus = document.focusedAccessibilityObject();
   if (!focus.isNull())
     tree_data.focus_id = focus.axID();
 
   WebAXObject anchor_object, focus_object;
   int anchor_offset, focus_offset;
   root.selection(anchor_object, anchor_offset, focus_object, focus_offset);
   if (!anchor_object.isNull() && !focus_object.isNull() &&
       anchor_offset >= 0 && focus_offset >= 0) {
@@ skipping 148 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());
 
+  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.invalidState()) {
     dst->AddIntAttribute(ui::AX_ATTR_INVALID_STATE,
                          AXInvalidStateFromBlink(src.invalidState()));
   }
-  if (src.invalidState() == blink::WebAXInvalidStateOther) {
+  if (src.invalidState() == blink::WebAXInvalidStateOther &&
+      src.ariaInvalidValue().length()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_ARIA_INVALID_VALUE, src.ariaInvalidValue().utf8());
   }
 
   if (src.textDirection()) {
     dst->AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                          AXTextDirectionFromBlink(src.textDirection()));
   }
 
   if (src.textStyle()) {
@@ skipping 26 matching lines @@
     dst->AddIntListAttribute(ui::AX_ATTR_WORD_ENDS, word_ends);
   }
 
   if (src.accessKey().length()) {
     dst->AddStringAttribute(ui::AX_ATTR_ACCESS_KEY, src.accessKey().utf8());
   }
 
   if (src.actionVerb().length()) {
     dst->AddStringAttribute(ui::AX_ATTR_ACTION, src.actionVerb().utf8());
   }
-  if (src.ariaAutoComplete().length())
+
+  if (src.ariaAutoComplete().length()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_AUTO_COMPLETE,
         src.ariaAutoComplete().utf8());
+  }
+
   if (src.isAriaReadOnly())
     dst->AddBoolAttribute(ui::AX_ATTR_ARIA_READONLY, true);
+
   if (src.isButtonStateMixed())
     dst->AddBoolAttribute(ui::AX_ATTR_STATE_MIXED, true);
+
   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());
   }
+
   if (!src.ariaActiveDescendant().isDetached()) {
     dst->AddIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID,
                          src.ariaActiveDescendant().axID());
   }
 
   if (!src.url().isEmpty())
     dst->AddStringAttribute(ui::AX_ATTR_URL, src.url().string().utf8());
 
   if (dst->role == ui::AX_ROLE_HEADING)
     dst->AddIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL, src.headingLevel());
@@ skipping 230 matching lines @@
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content