Adds color, font size, text direction and text styles to the accessibility tree.

content/shell/renderer/test_runner/web_ax_object_proxy.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/shell/renderer/test_runner/web_ax_object_proxy.h"
 
 #include "base/strings/stringprintf.h"
 #include "gin/handle.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ skipping 250 matching lines @@
 }
 
 std::string DeprecatedGetHelpText(const blink::WebAXObject& object) {
   std::string help_text = object.deprecatedHelpText().utf8();
   return help_text.insert(0, "AXHelp: ");
 }
 
 std::string GetStringValue(const blink::WebAXObject& object) {
   std::string value;
   if (object.role() == blink::WebAXRoleColorWell) {
-    int r, g, b;
-    object.colorValue(r, g, b);
-    value = base::StringPrintf("rgb %7.5f %7.5f %7.5f 1",
-                               r / 255., g / 255., b / 255.);
+    unsigned int color = object.colorValue();
+    unsigned int red = (color >> 16) & 0xFF;
+    unsigned int green = (color >> 8) & 0xFF;
+    unsigned int blue = color & 0xFF;
+    value = base::StringPrintf("rgba(%d, %d, %d, 1)",
+                               red, green, blue);
   } else {
     value = object.stringValue().utf8();
   }
   return value.insert(0, "AXValue: ");
 }
 
 std::string GetRole(const blink::WebAXObject& object) {
   std::string role_string = RoleToString(object.role());
 
   // Special-case canvas with fallback content because Chromium wants to treat
@@ skipping 43 matching lines @@
     end += inline_text_box.stringValue().length();
     if (characterIndex < start || characterIndex >= end)
       continue;
     blink::WebRect inline_text_box_rect = inline_text_box.boundingBoxRect();
     int localIndex = characterIndex - start;
     blink::WebVector<int> character_offsets;
     inline_text_box.characterOffsets(character_offsets);
     DCHECK(character_offsets.size() > 0 &&
            character_offsets.size() == inline_text_box.stringValue().length());
     switch (inline_text_box.textDirection()) {
+      case blink::WebAXTextDirectionUnknown:
       case blink::WebAXTextDirectionLR: {
         if (localIndex) {
           int left = inline_text_box_rect.x + character_offsets[localIndex - 1];
           int width = character_offsets[localIndex] -
               character_offsets[localIndex - 1];
           return blink::WebRect(left, inline_text_box_rect.y,
                                 width, inline_text_box_rect.height);
         }
         return blink::WebRect(
             inline_text_box_rect.x, inline_text_box_rect.y,
@@ skipping 154 matching lines @@
       .SetProperty("isSelectedOptionActive",
                    &WebAXObjectProxy::IsSelectedOptionActive)
       .SetProperty("isExpanded", &WebAXObjectProxy::IsExpanded)
       .SetProperty("isChecked", &WebAXObjectProxy::IsChecked)
       .SetProperty("isVisible", &WebAXObjectProxy::IsVisible)
       .SetProperty("isOffScreen", &WebAXObjectProxy::IsOffScreen)
       .SetProperty("isCollapsed", &WebAXObjectProxy::IsCollapsed)
       .SetProperty("hasPopup", &WebAXObjectProxy::HasPopup)
       .SetProperty("isValid", &WebAXObjectProxy::IsValid)
       .SetProperty("isReadOnly", &WebAXObjectProxy::IsReadOnly)
+      .SetProperty("backgroundColor", &WebAXObjectProxy::BackgroundColor)
+      .SetProperty("color", &WebAXObjectProxy::Color)
+      .SetProperty("colorValue", &WebAXObjectProxy::ColorValue)
+      .SetProperty("fontSize", &WebAXObjectProxy::FontSize)
       .SetProperty("orientation", &WebAXObjectProxy::Orientation)
       .SetProperty("posInSet", &WebAXObjectProxy::PosInSet)
       .SetProperty("setSize", &WebAXObjectProxy::SetSize)
       .SetProperty("clickPointX", &WebAXObjectProxy::ClickPointX)
       .SetProperty("clickPointY", &WebAXObjectProxy::ClickPointY)
       .SetProperty("rowCount", &WebAXObjectProxy::RowCount)
       .SetProperty("rowHeadersCount", &WebAXObjectProxy::RowHeadersCount)
       .SetProperty("columnCount", &WebAXObjectProxy::ColumnCount)
       .SetProperty("columnHeadersCount", &WebAXObjectProxy::ColumnHeadersCount)
       .SetProperty("isClickable", &WebAXObjectProxy::IsClickable)
@@ skipping 293 matching lines @@
 bool WebAXObjectProxy::IsValid() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return !accessibility_object_.isDetached();
 }
 
 bool WebAXObjectProxy::IsReadOnly() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.isReadOnly();
 }
 
+unsigned int WebAXObjectProxy::BackgroundColor() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.backgroundColor();
+}
+
+unsigned int WebAXObjectProxy::Color() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  unsigned int color = accessibility_object_.color();
+  // Remove the alpha because it's always 1 and thus not informative.
+  return color & 0xFFFFFF;
+}
+
+// For input elements of type color.
+unsigned int WebAXObjectProxy::ColorValue() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.colorValue();
+}
+
+float WebAXObjectProxy::FontSize() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.fontSize();
+}
+
 std::string WebAXObjectProxy::Orientation() {
   accessibility_object_.updateLayoutAndCheckValidity();
   if (accessibility_object_.orientation() == blink::WebAXOrientationVertical)
     return "AXOrientation: AXVerticalOrientation";
   else if (accessibility_object_.orientation()
            == blink::WebAXOrientationHorizontal)
     return "AXOrientation: AXHorizontalOrientation";
 
   return std::string();
 }
@@ skipping 462 matching lines @@
   v8::Local<v8::Value> value_handle = gin::CreateHandle(
       isolate, new WebAXObjectProxy(object, this)).ToV8();
   if (value_handle.IsEmpty())
     return v8::Local<v8::Object>();
   v8::Local<v8::Object> handle = value_handle->ToObject(isolate);
   elements_.Append(handle);
   return handle;
 }
 
 }  // namespace content