Make use of new AX name calc in Chromium.

third_party/WebKit/Source/modules/accessibility/AXNodeObject.h

 /*
  * Copyright (C) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 48 matching lines @@
 #endif
 
     bool computeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override;
     const AXObject* inheritsPresentationalRoleFrom() const override;
     virtual AccessibilityRole determineAccessibilityRole();
     AccessibilityRole determineAccessibilityRoleUtil();
     String accessibilityDescriptionForElements(WillBeHeapVector<RawPtrWillBeMember<Element>> &elements) const;
     void alterSliderValue(bool increase);
     String ariaAccessibilityDescription() const;
     String ariaAutoComplete() const;
-    void ariaLabelledbyElements(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements) const;
     AccessibilityRole determineAriaRoleAttribute() const;
-    void tokenVectorFromAttribute(Vector<String>&, const QualifiedName&) const;
-    void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, const QualifiedName&) const;
     void accessibilityChildrenFromAttribute(QualifiedName attr, AXObject::AXObjectVector&) const;
 
     bool hasContentEditableAttributeSet() const;
     bool isTextControl() const override;
     // This returns true if it's focusable but it's not content editable and it's not a control or ARIA control.
     bool isGenericFocusableElement() const;
     HTMLLabelElement* labelForElement(const Element*) const;
     AXObject* menuButtonForMenu() const;
     Element* menuItemElementForMenu() const;
     Element* mouseButtonListener() const;
-    String deprecatedPlaceholder() const;
     AccessibilityRole remapAriaRoleDueToParent(AccessibilityRole) const;
     bool isNativeCheckboxOrRadio() const;
     void setNode(Node*);
     AXObject* correspondingControlForLabelElement() const;
     HTMLLabelElement* labelElementContainer() const;
 
     //
     // Overridden from AXObject.
     //
 
@@ skipping 38 matching lines @@
     bool isReadOnly() const override;
     bool isRequired() const final;
 
     // Check whether certain properties can be modified.
     bool canSetFocusAttribute() const override;
     bool canSetValueAttribute() const override;
 
     // Properties of static elements.
     RGBA32 colorValue() const final;
     bool canvasHasFallbackContent() const final;
-    bool deprecatedExposesTitleUIElement() const override;
     int headingLevel() const final;
     unsigned hierarchicalLevel() const final;
     AccessibilityOrientation orientation() const override;
     String text() const override;
-    AXObject* deprecatedTitleUIElement() const override;
 
     // Properties of interactive elements.
     AccessibilityButtonState checkboxOrRadioValue() const final;
     InvalidState invalidState() const final;
     // Only used when invalidState() returns InvalidStateOther.
     String ariaInvalidValue() const final;
     String valueDescription() const override;
     float valueForRange() const override;
     float maxValueForRange() const override;
     float minValueForRange() const override;
     String stringValue() const override;
 
     // ARIA attributes.
     String ariaDescribedByAttribute() const final;
     String ariaLabelledbyAttribute() const final;
     AccessibilityRole ariaRoleAttribute() const final;
 
-    // Accessibility Text.
-    String deprecatedTextUnderElement(TextUnderElementMode) const override;
-    String deprecatedAccessibilityDescription() const override;
-    String deprecatedTitle(TextUnderElementMode) const override;
-    String deprecatedHelpText() const override;
-    String computedName() const override;
-
-    // New AX name calculation.
+    // AX name calculation.
     String textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom&, AXRelatedObjectVector*, NameSources*) const override;
     String description(AXNameFrom, AXDescriptionFrom&, AXObjectVector* descriptionObjects) const override;
     String description(AXNameFrom, AXDescriptionFrom&, DescriptionSources*, AXRelatedObjectVector*) const override;
+    String placeholder(AXNameFrom, AXDescriptionFrom) const override;
 
     // Location and click point in frame-relative coordinates.
     LayoutRect elementRect() const override;
 
     // High-level accessibility tree access.
     AXObject* computeParent() const override;
     AXObject* computeParentIfExists() const override;
 
     // Low-level accessibility tree exploration.
     AXObject* firstChild() const override;
@@ skipping 23 matching lines @@
     // Position in set and Size of set
     int posInSet() const override;
     int setSize() const override;
 
     // Aria-owns.
     void computeAriaOwnsChildren(HeapVector<Member<AXObject>>& ownedChildren);
 
 private:
     RawPtrWillBeMember<Node> m_node;
 
-    String deprecatedAlternativeTextForWebArea() const;
-    void deprecatedAlternativeText(HeapVector<Member<AccessibilityText>>&) const;
-    void deprecatedAriaLabelledbyText(HeapVector<Member<AccessibilityText>>&) const;
-
     String textFromDescendants(AXObjectSet& visited) const;
-    String textFromElements(bool inAriaLabelledByTraversal, AXObjectSet& visited, WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, AXRelatedObjectVector* relatedObjects) const;
-    String textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVector* relatedObjects) const;
-    String textFromAriaDescribedby(AXRelatedObjectVector* relatedObjects) const;
     String nativeTextAlternative(AXObjectSet& visited, AXNameFrom&, AXRelatedObjectVector*, NameSources*, bool* foundTextAlternative) const;
     float stepValueForRange() const;
     AXObject* findChildWithTagName(const HTMLQualifiedName&) const;
     bool isDescendantOfElementType(const HTMLQualifiedName& tagName) const;
-    String stringValueOfControl() const;
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXNodeObject, isAXNodeObject());
 
 } // namespace blink
 
 #endif // AXNodeObject_h