Make use of new AX name calc in Chromium.

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 "config.h"
 
 #include "modules/accessibility/InspectorAccessibilityAgent.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
@@ skipping 22 matching lines @@
 using TypeBuilder::Accessibility::AXValue;
 using TypeBuilder::Accessibility::AXWidgetAttributes;
 using TypeBuilder::Accessibility::AXWidgetStates;
 
 using namespace HTMLNames;
 
 namespace {
 
 void fillCoreProperties(AXObject* axObject, PassRefPtr<AXNode> nodeObject)
 {
-    // core properties
-    String description = axObject->deprecatedAccessibilityDescription();
+    // Description (secondary to the accessible name).
+    AXNameFrom nameFrom;
+    AXObject::AXObjectVector nameObjects;
+    axObject->name(nameFrom, &nameObjects);
+    AXDescriptionFrom descriptionFrom;
+    AXObject::AXObjectVector descriptionObjects;
+    String description = axObject->description(nameFrom, descriptionFrom, &descriptionObjects);
     if (!description.isEmpty())
         nodeObject->setDescription(createValue(description, AXValueType::ComputedString));
 
+    // Value.
     if (axObject->supportsRangeValue()) {
         nodeObject->setValue(createValue(axObject->valueForRange()));
     } else {
         String stringValue = axObject->stringValue();
         if (!stringValue.isEmpty())
             nodeObject->setValue(createValue(stringValue));
     }
-
-    String help = axObject->deprecatedHelpText();
-    if (!help.isEmpty())
-        nodeObject->setHelp(createValue(help, AXValueType::ComputedString));
 }
 
 void fillLiveRegionProperties(AXObject* axObject, PassRefPtr<TypeBuilder::Array<AXProperty>> properties)
 {
     if (!axObject->liveRegionRoot())
         return;
 
     properties->addItem(createProperty(AXLiveRegionAttributes::Live, createValue(axObject->containerLiveRegionStatus(), AXValueType::Token)));
     properties->addItem(createProperty(AXLiveRegionAttributes::Atomic, createBooleanValue(axObject->containerLiveRegionAtomic())));
     properties->addItem(createProperty(AXLiveRegionAttributes::Relevant, createValue(axObject->containerLiveRegionRelevant(), AXValueType::TokenList)));
@@ skipping 196 matching lines @@
     axObject->ariaFlowToElements(results);
     if (!results.isEmpty())
         properties->addItem(createRelatedNodeListProperty(AXRelationshipAttributes::Flowto, results, aria_flowtoAttr, axObject));
     results.clear();
 
     axObject->ariaControlsElements(results);
     if (!results.isEmpty())
         properties->addItem(createRelatedNodeListProperty(AXRelationshipAttributes::Controls, results, aria_controlsAttr, axObject));
     results.clear();
 
-    axObject->deprecatedAriaDescribedbyElements(results);
+    axObject->ariaDescribedbyElements(results);
     if (!results.isEmpty())
         properties->addItem(createRelatedNodeListProperty(AXRelationshipAttributes::Describedby, results, aria_describedbyAttr, axObject));
     results.clear();
 
-    axObject->deprecatedAriaLabelledbyElements(results);
+    axObject->ariaLabelledbyElements(results);
     if (!results.isEmpty())
         properties->addItem(createRelatedNodeListProperty(AXRelationshipAttributes::Labelledby, results, aria_labelledbyAttr, axObject));
     results.clear();
 
     axObject->ariaOwnsElements(results);
     if (!results.isEmpty())
         properties->addItem(createRelatedNodeListProperty(AXRelationshipAttributes::Owns, results, aria_ownsAttr, axObject));
     results.clear();
 }
 
@@ skipping 100 matching lines @@
     accessibilityNode = buildObjectForNode(node, axObject, cacheImpl, properties);
 }
 
 DEFINE_TRACE(InspectorAccessibilityAgent)
 {
     visitor->trace(m_page);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink