Finish all string attributes for Accessibility Object Model Phase 1.

content/shell/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/test_runner/web_ax_object_proxy.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 594 matching lines @@
       .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("fontFamily", &WebAXObjectProxy::FontFamily)
       .SetProperty("fontSize", &WebAXObjectProxy::FontSize)
+      .SetProperty("autocomplete", &WebAXObjectProxy::Autocomplete)
+      .SetProperty("current", &WebAXObjectProxy::Current)
+      .SetProperty("invalid", &WebAXObjectProxy::Invalid)
+      .SetProperty("keyShortcuts", &WebAXObjectProxy::KeyShortcuts)
+      .SetProperty("live", &WebAXObjectProxy::Live)
       .SetProperty("orientation", &WebAXObjectProxy::Orientation)
+      .SetProperty("relevant", &WebAXObjectProxy::Relevant)
+      .SetProperty("roleDescription", &WebAXObjectProxy::RoleDescription)
+      .SetProperty("sort", &WebAXObjectProxy::Sort)
       .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)
       .SetProperty("isButtonStateMixed", &WebAXObjectProxy::IsButtonStateMixed)
@@ skipping 439 matching lines @@
   accessibility_object_.updateLayoutAndCheckValidity();
   std::string font_family(accessibility_object_.fontFamily().utf8());
   return font_family.insert(0, "AXFontFamily: ");
 }
 
 float WebAXObjectProxy::FontSize() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.fontSize();
 }
 
+std::string WebAXObjectProxy::Autocomplete() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.ariaAutoComplete().utf8();
+}
+
+std::string WebAXObjectProxy::Current() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  switch (accessibility_object_.ariaCurrentState()) {
+    case blink::WebAXAriaCurrentStateFalse:
+      return "false";
+    case blink::WebAXAriaCurrentStateTrue:
+      return "true";
+    case blink::WebAXAriaCurrentStatePage:
+      return "page";
+    case blink::WebAXAriaCurrentStateStep:
+      return "step";
+    case blink::WebAXAriaCurrentStateLocation:

[esprehn, 2017/04/04 06:22:30]

It'd be really nice if you'd onion soup all this stuff and remove all the
plumbing

[dmazzoni, 2017/04/04 18:59:17]

Sounds great. I threw a quick meeting on your calendar to
go over the high-level design, I'll write a doc from that.

+      return "location";
+    case blink::WebAXAriaCurrentStateDate:
+      return "date";
+    case blink::WebAXAriaCurrentStateTime:
+      return "time";
+    default:
+      return std::string();
+  }
+}
+
+std::string WebAXObjectProxy::Invalid() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  switch (accessibility_object_.invalidState()) {
+    case blink::WebAXInvalidStateFalse:
+      return "false";
+    case blink::WebAXInvalidStateTrue:
+      return "true";
+    case blink::WebAXInvalidStateSpelling:
+      return "spelling";
+    case blink::WebAXInvalidStateGrammar:
+      return "grammar";
+    case blink::WebAXInvalidStateOther:
+      return "other";
+    default:
+      return std::string();
+  }
+}
+
+std::string WebAXObjectProxy::KeyShortcuts() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  SparseAttributeAdapter attribute_adapter;
+  accessibility_object_.getSparseAXAttributes(attribute_adapter);
+  return attribute_adapter
+      .string_attributes[blink::WebAXStringAttribute::AriaKeyShortcuts]
+      .utf8();
+}
+
+std::string WebAXObjectProxy::Live() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.liveRegionStatus().utf8();
+}
+
 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();
 }
 
+std::string WebAXObjectProxy::Relevant() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  return accessibility_object_.liveRegionRelevant().utf8();
+}
+
+std::string WebAXObjectProxy::RoleDescription() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  SparseAttributeAdapter attribute_adapter;
+  accessibility_object_.getSparseAXAttributes(attribute_adapter);
+  return attribute_adapter
+      .string_attributes[blink::WebAXStringAttribute::AriaRoleDescription]
+      .utf8();
+}
+
+std::string WebAXObjectProxy::Sort() {
+  accessibility_object_.updateLayoutAndCheckValidity();
+  switch (accessibility_object_.sortDirection()) {
+    case blink::WebAXSortDirectionAscending:
+      return "ascending";
+    case blink::WebAXSortDirectionDescending:
+      return "descending";
+    case blink::WebAXSortDirectionOther:
+      return "other";
+    default:
+      return std::string();
+  }
+}
+
 int WebAXObjectProxy::PosInSet() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.posInSet();
 }
 
 int WebAXObjectProxy::SetSize() {
   accessibility_object_.updateLayoutAndCheckValidity();
   return accessibility_object_.setSize();
 }
 
@@ skipping 661 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 test_runner