| Index: Source/modules/accessibility/AXNodeObject.cpp
|
| diff --git a/Source/modules/accessibility/AXNodeObject.cpp b/Source/modules/accessibility/AXNodeObject.cpp
|
| index 2c79418780600d03ca686cadf8e37ec36e2a7183..d557588d3db846e851c4901b5713936ea46ce62e 100644
|
| --- a/Source/modules/accessibility/AXNodeObject.cpp
|
| +++ b/Source/modules/accessibility/AXNodeObject.cpp
|
| @@ -1588,10 +1588,10 @@ String AXNodeObject::deprecatedTextUnderElement(TextUnderElementMode mode) const
|
| continue;
|
|
|
| if (child->isAXNodeObject()) {
|
| - Vector<AccessibilityText> textOrder;
|
| + WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>> textOrder;
|
| toAXNodeObject(child)->alternativeText(textOrder);
|
| if (textOrder.size() > 0) {
|
| - builder.append(textOrder[0].text);
|
| + builder.append(textOrder[0]->text());
|
| if (mode == TextUnderElementAny)
|
| break;
|
| continue;
|
| @@ -2340,12 +2340,12 @@ String AXNodeObject::alternativeTextForWebArea() const
|
| return String();
|
| }
|
|
|
| -void AXNodeObject::alternativeText(Vector<AccessibilityText>& textOrder) const
|
| +void AXNodeObject::alternativeText(WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>>& textOrder) const
|
| {
|
| if (isWebArea()) {
|
| String webAreaText = alternativeTextForWebArea();
|
| if (!webAreaText.isEmpty())
|
| - textOrder.append(AccessibilityText(webAreaText, AlternativeText));
|
| + textOrder.append(AccessibilityText::create(webAreaText, AlternativeText));
|
| return;
|
| }
|
|
|
| @@ -2353,18 +2353,18 @@ void AXNodeObject::alternativeText(Vector<AccessibilityText>& textOrder) const
|
|
|
| const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
|
| if (!ariaLabel.isEmpty())
|
| - textOrder.append(AccessibilityText(ariaLabel, AlternativeText));
|
| + textOrder.append(AccessibilityText::create(ariaLabel, AlternativeText));
|
|
|
| if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
|
| // Images should use alt as long as the attribute is present, even if empty.
|
| // Otherwise, it should fallback to other methods, like the title attribute.
|
| const AtomicString& alt = getAttribute(altAttr);
|
| if (!alt.isNull())
|
| - textOrder.append(AccessibilityText(alt, AlternativeText));
|
| + textOrder.append(AccessibilityText::create(alt, AlternativeText));
|
| }
|
| }
|
|
|
| -void AXNodeObject::ariaLabeledByText(Vector<AccessibilityText>& textOrder) const
|
| +void AXNodeObject::ariaLabeledByText(WillBeHeapVector<OwnPtrWillBeMember<AccessibilityText>>& textOrder) const
|
| {
|
| String ariaLabeledBy = ariaLabeledByAttribute();
|
| if (!ariaLabeledBy.isEmpty()) {
|
| @@ -2372,8 +2372,8 @@ void AXNodeObject::ariaLabeledByText(Vector<AccessibilityText>& textOrder) const
|
| ariaLabeledByElements(elements);
|
|
|
| for (const auto& element : elements) {
|
| - RefPtr<AXObject> axElement = axObjectCache()->getOrCreate(element);
|
| - textOrder.append(AccessibilityText(ariaLabeledBy, AlternativeText, axElement));
|
| + RefPtrWillBeRawPtr<AXObject> axElement = axObjectCache()->getOrCreate(element);
|
| + textOrder.append(AccessibilityText::create(ariaLabeledBy, AlternativeText, axElement));
|
| }
|
| }
|
| }
|
|
|