Title: [224119] trunk/Source/WebCore
- Revision
- 224119
- Author
- [email protected]
- Date
- 2017-10-27 10:39:16 -0700 (Fri, 27 Oct 2017)
Log Message
Fix accessibility/mac/aria-label-on-label-element.html after r224074
https://bugs.webkit.org/show_bug.cgi?id=178892
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::titleElementText const):
(WebCore::AccessibilityNodeObject::ariaLabeledByText const):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityText::AccessibilityText):
Turns out my null checks changed behavior. This undoes them.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224118 => 224119)
--- trunk/Source/WebCore/ChangeLog 2017-10-27 17:33:54 UTC (rev 224118)
+++ trunk/Source/WebCore/ChangeLog 2017-10-27 17:39:16 UTC (rev 224119)
@@ -1,3 +1,15 @@
+2017-10-27 Alex Christensen <[email protected]>
+
+ Fix accessibility/mac/aria-label-on-label-element.html after r224074
+ https://bugs.webkit.org/show_bug.cgi?id=178892
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::titleElementText const):
+ (WebCore::AccessibilityNodeObject::ariaLabeledByText const):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityText::AccessibilityText):
+ Turns out my null checks changed behavior. This undoes them.
+
2017-10-27 Ryan Haddad <[email protected]>
Unreviewed, rolling out r223999.
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (224118 => 224119)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-10-27 17:33:54 UTC (rev 224118)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-10-27 17:39:16 UTC (rev 224119)
@@ -1293,8 +1293,8 @@
String innerText = textForLabelElement(label);
// Only use the <label> text if there's no ARIA override.
- if (labelObject && !innerText.isEmpty() && !ariaAccessibilityDescription())
- textOrder.append(AccessibilityText(innerText, isMeter() ? AccessibilityTextSource::Alternative : AccessibilityTextSource::LabelByElement, *labelObject));
+ if (!innerText.isEmpty() && !ariaAccessibilityDescription())
+ textOrder.append(AccessibilityText(innerText, isMeter() ? AccessibilityTextSource::Alternative : AccessibilityTextSource::LabelByElement, labelObject));
return;
}
}
@@ -1301,7 +1301,7 @@
AccessibilityObject* titleUIElement = this->titleUIElement();
if (titleUIElement)
- textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, *titleUIElement));
+ textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, titleUIElement));
}
void AccessibilityNodeObject::alternativeText(Vector<AccessibilityText>& textOrder) const
@@ -1481,11 +1481,9 @@
Vector<Element*> elements;
ariaLabeledByElements(elements);
- Vector<Ref<AccessibilityObject>> axElements;
- for (const auto& element : elements) {
- if (auto axElement = axObjectCache()->getOrCreate(element))
- axElements.append(*axElement);
- }
+ Vector<RefPtr<AccessibilityObject>> axElements;
+ for (const auto& element : elements)
+ axElements.append(axObjectCache()->getOrCreate(element));
textOrder.append(AccessibilityText(ariaLabeledBy, AccessibilityTextSource::Alternative, WTFMove(axElements)));
}
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (224118 => 224119)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-10-27 17:33:54 UTC (rev 224118)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-10-27 17:39:16 UTC (rev 224119)
@@ -255,7 +255,7 @@
struct AccessibilityText {
String text;
AccessibilityTextSource textSource;
- Vector<Ref<AccessibilityObject>> textElements;
+ Vector<RefPtr<AccessibilityObject>> textElements;
AccessibilityText(const String& t, const AccessibilityTextSource& s)
: text(t)
@@ -262,13 +262,13 @@
, textSource(s)
{ }
- AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<Ref<AccessibilityObject>> elements)
+ AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<RefPtr<AccessibilityObject>> elements)
: text(t)
, textSource(s)
, textElements(WTFMove(elements))
{ }
- AccessibilityText(const String& t, const AccessibilityTextSource& s, Ref<AccessibilityObject>&& element)
+ AccessibilityText(const String& t, const AccessibilityTextSource& s, RefPtr<AccessibilityObject>&& element)
: text(t)
, textSource(s)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
