| Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.h
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h
|
| index 0061dbb9691a51c73aff7dd0a900953475360bf0..0b6bdf35a4ec3070285d675546f230d44d61028d 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h
|
| @@ -66,7 +66,7 @@ protected:
|
| void alterSliderValue(bool increase);
|
| String ariaAccessibilityDescription() const;
|
| String ariaAutoComplete() const;
|
| - void ariaLabelledbyElements(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements) const;
|
| + void ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements) const;
|
| AccessibilityRole determineAriaRoleAttribute() const;
|
| void tokenVectorFromAttribute(Vector<String>&, const QualifiedName&) const;
|
| void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, const QualifiedName&) const;
|
| @@ -80,7 +80,6 @@ protected:
|
| AXObject* menuButtonForMenu() const;
|
| Element* menuItemElementForMenu() const;
|
| Element* mouseButtonListener() const;
|
| - String deprecatedPlaceholder() const;
|
| AccessibilityRole remapAriaRoleDueToParent(AccessibilityRole) const;
|
| bool isNativeCheckboxOrRadio() const;
|
| void setNode(Node*);
|
| @@ -139,12 +138,10 @@ protected:
|
| // 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;
|
| @@ -162,17 +159,11 @@ protected:
|
| 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;
|
| @@ -216,10 +207,6 @@ protected:
|
| 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;
|
| @@ -228,7 +215,6 @@ private:
|
| float stepValueForRange() const;
|
| AXObject* findChildWithTagName(const HTMLQualifiedName&) const;
|
| bool isDescendantOfElementType(const HTMLQualifiedName& tagName) const;
|
| - String stringValueOfControl() const;
|
| };
|
|
|
| DEFINE_AX_OBJECT_TYPE_CASTS(AXNodeObject, isAXNodeObject());
|
|
|