Changeset 224119 in webkit


Ignore:
Timestamp:
Oct 27, 2017 10:39:16 AM (6 years ago)
Author:
achristensen@apple.com
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.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r224116 r224119  
     12017-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
    1132017-10-27  Ryan Haddad  <ryanhaddad@apple.com>
    214
  • trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

    r224074 r224119  
    12941294           
    12951295            // 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));
    12981298            return;
    12991299        }
     
    13021302    AccessibilityObject* titleUIElement = this->titleUIElement();
    13031303    if (titleUIElement)
    1304         textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, *titleUIElement));
     1304        textOrder.append(AccessibilityText(String(), AccessibilityTextSource::LabelByElement, titleUIElement));
    13051305}
    13061306
     
    14821482        ariaLabeledByElements(elements);
    14831483       
    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));
    14891487       
    14901488        textOrder.append(AccessibilityText(ariaLabeledBy, AccessibilityTextSource::Alternative, WTFMove(axElements)));
  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r224074 r224119  
    256256    String text;
    257257    AccessibilityTextSource textSource;
    258     Vector<Ref<AccessibilityObject>> textElements;
     258    Vector<RefPtr<AccessibilityObject>> textElements;
    259259   
    260260    AccessibilityText(const String& t, const AccessibilityTextSource& s)
     
    263263    { }
    264264
    265     AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<Ref<AccessibilityObject>> elements)
     265    AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<RefPtr<AccessibilityObject>> elements)
    266266        : text(t)
    267267        , textSource(s)
     
    269269    { }
    270270
    271     AccessibilityText(const String& t, const AccessibilityTextSource& s, Ref<AccessibilityObject>&& element)
     271    AccessibilityText(const String& t, const AccessibilityTextSource& s, RefPtr<AccessibilityObject>&& element)
    272272        : text(t)
    273273        , textSource(s)
Note: See TracChangeset for help on using the changeset viewer.