Adds color, font size, text direction and text styles to the 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 <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 216 matching lines @@
   std::string name = UTF16ToUTF8(src.deprecatedTitle());
 
   std::string value;
   if (src.valueDescription().length()) {
     dst->AddStringAttribute(ui::AX_ATTR_VALUE,
                             UTF16ToUTF8(src.valueDescription()));
   } else {
     dst->AddStringAttribute(ui::AX_ATTR_VALUE, UTF16ToUTF8(src.stringValue()));
   }
 
-  if (dst->role == ui::AX_ROLE_COLOR_WELL) {
-    int r, g, b;
-    src.colorValue(r, g, b);
-    dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE_RED, r);
-    dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE_GREEN, g);
-    dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE_BLUE, b);
-  }
+  if (dst->role == ui::AX_ROLE_COLOR_WELL)
+    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());
+
+  // 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) {
     dst->AddStringAttribute(ui::AX_ATTR_ARIA_INVALID_VALUE,
                             UTF16ToUTF8(src.ariaInvalidValue()));
   }
 
-  if (dst->role == ui::AX_ROLE_INLINE_TEXT_BOX) {
+  if (src.textDirection()) {
     dst->AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                          AXTextDirectionFromBlink(src.textDirection()));
+  }
 
+  if (src.textStyle()) {
+    dst->AddIntAttribute(ui::AX_ATTR_TEXT_STYLE,
+                         AXTextStyleFromBlink(src.textStyle()));
+  }
+
+
+  if (dst->role == ui::AX_ROLE_INLINE_TEXT_BOX) {
     WebVector<int> src_character_offsets;
     src.characterOffsets(src_character_offsets);
     std::vector<int32> character_offsets;
     character_offsets.reserve(src_character_offsets.size());
     for (size_t i = 0; i < src_character_offsets.size(); ++i)
       character_offsets.push_back(src_character_offsets[i]);
     dst->AddIntListAttribute(ui::AX_ATTR_CHARACTER_OFFSETS, character_offsets);
 
     WebVector<int> src_word_starts;
     WebVector<int> src_word_ends;
@@ skipping 345 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