Add sparse accessibility attribute interface to Blink

third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp

 // 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 "modules/accessibility/InspectorAccessibilityAgent.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
@@ skipping 309 matching lines @@
     const String& key,
     AXObject::AXObjectVector& nodes,
     const QualifiedName& attr,
     AXObject& axObject) {
   std::unique_ptr<AXValue> nodeListValue = createRelatedNodeListValue(nodes);
   const AtomicString& attrValue = axObject.getAttribute(attr);
   nodeListValue->setValue(protocol::StringValue::create(attrValue));
   return createProperty(key, std::move(nodeListValue));
 }
 
+class SparseAttributeAXPropertyAdapter
+    : public GarbageCollected<SparseAttributeAXPropertyAdapter>,
+      public AXSparseAttributeClient {
+ public:
+  SparseAttributeAXPropertyAdapter(AXObject& axObject,
+                                   protocol::Array<AXProperty>& properties)
+      : m_axObject(&axObject), m_properties(properties) {}
+
+  DEFINE_INLINE_TRACE() { visitor->trace(m_axObject); }
+
+ private:
+  Member<AXObject> m_axObject;
+  protocol::Array<AXProperty>& m_properties;
+
+  void addBoolAttribute(AXBoolAttribute attribute, bool value) {}
+
+  void addStringAttribute(AXStringAttribute attribute, const String& value) {}
+
+  void addObjectAttribute(AXObjectAttribute attribute, AXObject* object) {
+    switch (attribute) {
+      case AXObjectAttribute::AriaActiveDescendant:
+        m_properties.addItem(
+            createProperty(AXRelationshipAttributesEnum::Activedescendant,
+                           createRelatedNodeListValue(*object)));
+        break;
+    }
+  }
+
+  void addObjectVectorAttribute(AXObjectVectorAttribute attribute,
+                                HeapVector<Member<AXObject>>& objects) {
+    switch (attribute) {
+      case AXObjectVectorAttribute::AriaControls:
+        m_properties.addItem(createRelatedNodeListProperty(
+            AXRelationshipAttributesEnum::Controls, objects, aria_controlsAttr,
+            *m_axObject));
+        break;
+      case AXObjectVectorAttribute::AriaFlowTo:
+        m_properties.addItem(createRelatedNodeListProperty(
+            AXRelationshipAttributesEnum::Flowto, objects, aria_flowtoAttr,
+            *m_axObject));
+        break;
+    }
+  }
+};
+
 void fillRelationships(AXObject& axObject,
                        protocol::Array<AXProperty>& properties) {
-  if (AXObject* activeDescendant = axObject.activeDescendant()) {
-    properties.addItem(
-        createProperty(AXRelationshipAttributesEnum::Activedescendant,
-                       createRelatedNodeListValue(*activeDescendant)));
-  }
-
   AXObject::AXObjectVector results;
-  axObject.ariaFlowToElements(results);
-  if (!results.isEmpty())
-    properties.addItem(
-        createRelatedNodeListProperty(AXRelationshipAttributesEnum::Flowto,
-                                      results, aria_flowtoAttr, axObject));
-  results.clear();
-
-  axObject.ariaControlsElements(results);
-  if (!results.isEmpty())
-    properties.addItem(
-        createRelatedNodeListProperty(AXRelationshipAttributesEnum::Controls,
-                                      results, aria_controlsAttr, axObject));
-  results.clear();
-
   axObject.ariaDescribedbyElements(results);
   if (!results.isEmpty())
     properties.addItem(
         createRelatedNodeListProperty(AXRelationshipAttributesEnum::Describedby,
                                       results, aria_describedbyAttr, axObject));
   results.clear();
 
   axObject.ariaOwnsElements(results);
   if (!results.isEmpty())
     properties.addItem(createRelatedNodeListProperty(
@@ skipping 175 matching lines @@
   nodeObject->setRole(createRoleNameValue(role));
 
   std::unique_ptr<protocol::Array<AXProperty>> properties =
       protocol::Array<AXProperty>::create();
   fillLiveRegionProperties(axObject, *(properties.get()));
   fillGlobalStates(axObject, *(properties.get()));
   fillWidgetProperties(axObject, *(properties.get()));
   fillWidgetStates(axObject, *(properties.get()));
   fillRelationships(axObject, *(properties.get()));
 
+  Member<SparseAttributeAXPropertyAdapter> adapter =
+      new SparseAttributeAXPropertyAdapter(axObject, *(properties.get()));

[dcheng, 2017/01/19 23:02:45]

Nit: just write *properties

[dmazzoni, 2017/01/21 00:16:35]

Done.

+  axObject.getSparseAXAttributes(*adapter.get());
+
   AXObject::NameSources nameSources;
   String computedName = axObject.name(&nameSources);
   if (!nameSources.isEmpty()) {
     std::unique_ptr<AXValue> name =
         createValue(computedName, AXValueTypeEnum::ComputedString);
     if (!nameSources.isEmpty()) {
       std::unique_ptr<protocol::Array<AXValueSource>> nameSourceProperties =
           protocol::Array<AXValueSource>::create();
       for (size_t i = 0; i < nameSources.size(); ++i) {
         NameSource& nameSource = nameSources[i];
@@ skipping 122 matching lines @@
   }
 }
 
 DEFINE_TRACE(InspectorAccessibilityAgent) {
   visitor->trace(m_page);
   visitor->trace(m_domAgent);
   InspectorBaseAgent::trace(visitor);
 }
 
 }  // namespace blink