Make use of new AX name calc in Chromium.

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

 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * 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.
@@ skipping 319 matching lines @@
 // The potential native HTML-based text (name, description or placeholder) sources for an element.
 // See http://rawgit.com/w3c/aria/master/html-aam/html-aam.html#accessible-name-and-description-calculation
 enum AXTextFromNativeHTML {
     AXTextFromNativeHTMLUninitialized = -1,
     AXTextFromNativeHTMLFigcaption,
     AXTextFromNativeHTMLLabel,
     AXTextFromNativeHTMLLabelFor,
     AXTextFromNativeHTMLLabelWrapped,
     AXTextFromNativeHTMLLegend,
     AXTextFromNativeHTMLTableCaption,
+    AXTextFromNativeHTMLTitleElement,
 };
 
 // The source of the accessible description of an element. This is needed
 // because on some platforms this determines how the accessible description
 // is exposed.
 enum AXDescriptionFrom {
     AXDescriptionFromUninitialized = -1,
     AXDescriptionFromAttribute = 0,
     AXDescriptionFromContents,
     AXDescriptionFromPlaceholder,
@@ skipping 311 matching lines @@
     bool isDescendantOfLeafNode() const;
     AXObject* leafNodeAncestor() const;
     bool isDescendantOfDisabledNode() const;
     const AXObject* disabledAncestor() const;
     bool lastKnownIsIgnoredValue();
     void setLastKnownIsIgnoredValue(bool);
     bool hasInheritedPresentationalRole() const;
     bool isPresentationalChild() const;
 
     //
-    // Deprecated text alternative calculation API. All of these will be replaced
-    // with the new API, below (under "New text alternative calculation API".
-    //
-
-    virtual bool deprecatedExposesTitleUIElement() const { return true; }
-    virtual AXObject* deprecatedTitleUIElement() const { return 0; }
-    virtual String deprecatedPlaceholder() const { return String(); }
-    virtual void deprecatedAriaDescribedbyElements(AXObjectVector& describedby) const { }
-    virtual void deprecatedAriaLabelledbyElements(AXObjectVector& labelledby) const { }
-    virtual String deprecatedAccessibilityDescription() const { return String(); }
-    virtual String deprecatedTitle(TextUnderElementMode mode = TextUnderElementAll) const { return String(); }
-    virtual String deprecatedHelpText() const { return String(); }
-    virtual String deprecatedTextUnderElement(TextUnderElementMode mode = TextUnderElementAll) const { return String(); }
-
-    //
-    // New text alternative calculation API (under development).
+    // Accessible name calculation
     //
 
     // Retrieves the accessible name of the object, an enum indicating where the name
     // was derived from, and a list of objects that were used to derive the name, if any.
     virtual String name(AXNameFrom&, AXObjectVector* nameObjects) const;
 
     typedef HeapVector<NameSource> NameSources;
     // Retrieves the accessible name of the object and a list of all potential sources
     // for the name, indicating which were used.
     virtual String name(NameSources*) const;
 
     typedef HeapVector<DescriptionSource> DescriptionSources;
     // Takes the result of nameFrom from calling |name|, above, and retrieves the
     // accessible description of the object, which is secondary to |name|, an enum indicating
     // where the description was derived from, and a list of objects that were used to
     // derive the description, if any.
     virtual String description(AXNameFrom, AXDescriptionFrom&, AXObjectVector* descriptionObjects) const { return String(); }
 
     // Same as above, but returns a list of all potential sources for the description, indicating which were used.
     virtual String description(AXNameFrom, AXDescriptionFrom&, DescriptionSources*, AXRelatedObjectVector*) const { return String(); }
 
     // Takes the result of nameFrom and descriptionFrom from calling |name| and |description|,
     // above, and retrieves the placeholder of the object, if present and if it wasn't already
     // exposed by one of the two functions above.
-    virtual String placeholder(AXNameFrom, AXDescriptionFrom) { return String(); }
+    virtual String placeholder(AXNameFrom, AXDescriptionFrom) const { return String(); }
 
     // Internal function used by name and description, above.
     typedef HeapHashSet<Member<const AXObject>> AXObjectSet;
     virtual String textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const { return String(); }
 
     // Returns result of Accessible Name Calculation algorithm.
     // This is a simpler high-level interface to |name| used by Inspector.
-    virtual String computedName() const { return String(); }
+    String computedName() const;
 
     //
     // Properties of static elements.
     //
 
     virtual const AtomicString& accessKey() const { return nullAtom; }
     virtual RGBA32 backgroundColor() const { return Color::transparent; }
     virtual RGBA32 color() const { return Color::black; }
     // Used by objects of role ColorWellRole.
     virtual RGBA32 colorValue() const { return Color::transparent; }
@@ skipping 37 matching lines @@
     virtual float minValueForRange() const { return 0.0f; }
     virtual String stringValue() const { return String(); }
 
     // ARIA attributes.
     virtual AXObject* activeDescendant() const { return 0; }
     virtual String ariaAutoComplete() const { return String(); }
     virtual String ariaDescribedByAttribute() const { return String(); }
     virtual void ariaFlowToElements(AXObjectVector&) const { }
     virtual void ariaControlsElements(AXObjectVector&) const { }
     virtual void ariaOwnsElements(AXObjectVector& owns) const { }
+    virtual void ariaDescribedbyElements(AXObjectVector&) const { }
+    virtual void ariaLabelledbyElements(AXObjectVector&) const { }
     virtual bool ariaHasPopup() const { return false; }
     virtual bool isEditable() const { return false; }
     bool isMultiline() const;
     virtual bool isRichlyEditable() const { return false; }
     virtual String ariaLabelledbyAttribute() const { return String(); }
     bool ariaPressedIsPresent() const;
     virtual AccessibilityRole ariaRoleAttribute() const { return UnknownRole; }
     virtual bool ariaRoleHasPresentationalChildren() const { return false; }
     virtual AXObject* ancestorForWhichThisIsAPresentationalChild() const { return 0; }
     virtual bool shouldFocusActiveDescendant() const { return false; }
@@ skipping 143 matching lines @@
     static bool isInsideFocusableElementOrARIAWidget(const Node&);
 
 protected:
     AXID m_id;
     AXObjectVector m_children;
     mutable bool m_haveChildren;
     AccessibilityRole m_role;
     AXObjectInclusion m_lastKnownIsIgnoredValue;
     LayoutRect m_explicitElementRect;
 
-    // Used only in recursive calls from textAlternative()
+    // Used only inside textAlternative():
     static String recursiveTextAlternative(const AXObject&, bool inAriaLabelledByTraversal, AXObjectSet& visited);
+    String ariaTextAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom&, AXRelatedObjectVector*, NameSources*, bool* foundTextAlternative) const;
+    String textFromElements(bool inAriaLabelledByTraversal, AXObjectSet& visited, WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, AXRelatedObjectVector* relatedObjects) const;
+    void tokenVectorFromAttribute(Vector<String>&, const QualifiedName&) const;
+    void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, const QualifiedName&) const;
+    void ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements) const;
+    String textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVector* relatedObjects) const;
+    String textFromAriaDescribedby(AXRelatedObjectVector* relatedObjects) const;
 
     virtual const AXObject* inheritsPresentationalRoleFrom() const { return 0; }
 
-    bool nameFromContents() const;
+    virtual bool nameFromContents() const;
 
     AccessibilityRole buttonRoleType() const;
 
     unsigned getLengthForTextRange() const { return text().length(); }
 
     bool m_detached;
 
     mutable Member<AXObject> m_parent;
 
     // The following cached attribute values (the ones starting with m_cached*)
@@ skipping 23 matching lines @@
 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate) \
     DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, object.predicate)
 
 } // namespace blink
 
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::IgnoredReason);
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::NameSource);
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::DescriptionSource);
 
 #endif // AXObject_h