Changeset 224119 in webkit
- Timestamp:
- Oct 27, 2017 10:39:16 AM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r224116 r224119 1 2017-10-27 Alex Christensen <achristensen@webkit.org> 2 3 Fix accessibility/mac/aria-label-on-label-element.html after r224074 4 https://bugs.webkit.org/show_bug.cgi?id=178892 5 6 * accessibility/AccessibilityNodeObject.cpp: 7 (WebCore::AccessibilityNodeObject::titleElementText const): 8 (WebCore::AccessibilityNodeObject::ariaLabeledByText const): 9 * accessibility/AccessibilityObject.h: 10 (WebCore::AccessibilityText::AccessibilityText): 11 Turns out my null checks changed behavior. This undoes them. 12 1 13 2017-10-27 Ryan Haddad <ryanhaddad@apple.com> 2 14 -
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
r224074 r224119 1294 1294 1295 1295 // Only use the <label> text if there's no ARIA override. 1296 if ( labelObject &&!innerText.isEmpty() && !ariaAccessibilityDescription())1297 textOrder.append(AccessibilityText(innerText, isMeter() ? AccessibilityTextSource::Alternative : AccessibilityTextSource::LabelByElement, *labelObject));1296 if (!innerText.isEmpty() && !ariaAccessibilityDescription()) 1297 textOrder.append(AccessibilityText(innerText, isMeter() ? AccessibilityTextSource::Alternative : AccessibilityTextSource::LabelByElement, labelObject)); 1298 1298 return; 1299 1299 } … … 1302 1302 AccessibilityObject* titleUIElement = this->titleUIElement(); 1303 1303 if (titleUIElement) 1304 textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, *titleUIElement));1304 textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, titleUIElement)); 1305 1305 } 1306 1306 … … 1482 1482 ariaLabeledByElements(elements); 1483 1483 1484 Vector<Ref<AccessibilityObject>> axElements; 1485 for (const auto& element : elements) { 1486 if (auto axElement = axObjectCache()->getOrCreate(element)) 1487 axElements.append(*axElement); 1488 } 1484 Vector<RefPtr<AccessibilityObject>> axElements; 1485 for (const auto& element : elements) 1486 axElements.append(axObjectCache()->getOrCreate(element)); 1489 1487 1490 1488 textOrder.append(AccessibilityText(ariaLabeledBy, AccessibilityTextSource::Alternative, WTFMove(axElements))); -
trunk/Source/WebCore/accessibility/AccessibilityObject.h
r224074 r224119 256 256 String text; 257 257 AccessibilityTextSource textSource; 258 Vector<Ref <AccessibilityObject>> textElements;258 Vector<RefPtr<AccessibilityObject>> textElements; 259 259 260 260 AccessibilityText(const String& t, const AccessibilityTextSource& s) … … 263 263 { } 264 264 265 AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<Ref <AccessibilityObject>> elements)265 AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<RefPtr<AccessibilityObject>> elements) 266 266 : text(t) 267 267 , textSource(s) … … 269 269 { } 270 270 271 AccessibilityText(const String& t, const AccessibilityTextSource& s, Ref <AccessibilityObject>&& element)271 AccessibilityText(const String& t, const AccessibilityTextSource& s, RefPtr<AccessibilityObject>&& element) 272 272 : text(t) 273 273 , textSource(s)
Note: See TracChangeset
for help on using the changeset viewer.