Changeset 258681 in webkit


Ignore:
Timestamp:
Mar 18, 2020 10:18:29 PM (4 years ago)
Author:
Andres Gonzalez
Message:

Use helper function retainPtr(T*) instead of creating one.
​https://bugs.webkit.org/show_bug.cgi?id=209269

Reviewed by Chris Fleizach.

This is acorrection to patch in bug: ​https://bugs.webkit.org/show_bug.cgi?id=209247.
Use the existing retainPtr helper funtion instead of creating a new helper.

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper attachmentView]):
(-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]):
(-[WebAccessibilityObjectWrapper textMarkerRangeFromVisiblePositions:endPosition:]):
(-[WebAccessibilityObjectWrapper associatedPluginParent]):
(-[WebAccessibilityObjectWrapper windowElement:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
(-[WebAccessibilityObjectWrapper textMarkerRangeAtTextMarker:forUnit:]):
(-[WebAccessibilityObjectWrapper lineTextMarkerRangeForTextMarker:forUnit:]):
(-[WebAccessibilityObjectWrapper textMarkerForTextMarker:atUnit:]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
(retainWrapper): Deleted.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r258680 r258681  
     12020-03-18  Andres Gonzalez  <andresg_22@apple.com>
     2
     3        Use helper function retainPtr(T*) instead of creating one.
     4        https://bugs.webkit.org/show_bug.cgi?id=209269
     5
     6        Reviewed by Chris Fleizach.
     7
     8        This is acorrection to patch in bug: https://bugs.webkit.org/show_bug.cgi?id=209247.
     9        Use the existing retainPtr helper funtion instead of creating a new helper.
     10
     11        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     12        (-[WebAccessibilityObjectWrapper attachmentView]):
     13        (-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]):
     14        (-[WebAccessibilityObjectWrapper textMarkerRangeFromVisiblePositions:endPosition:]):
     15        (-[WebAccessibilityObjectWrapper associatedPluginParent]):
     16        (-[WebAccessibilityObjectWrapper windowElement:]):
     17        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
     18        (-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
     19        (-[WebAccessibilityObjectWrapper textMarkerRangeAtTextMarker:forUnit:]):
     20        (-[WebAccessibilityObjectWrapper lineTextMarkerRangeForTextMarker:forUnit:]):
     21        (-[WebAccessibilityObjectWrapper textMarkerForTextMarker:atUnit:]):
     22        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]):
     23        (retainWrapper): Deleted.
     24
    1252020-03-18  Zalan Bujtas  <zalan@apple.com>
    226

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r258673 r258681  
    554554}
    555555
    556 static inline RetainPtr<WebAccessibilityObjectWrapper> retainWrapper(WebAccessibilityObjectWrapper* wrapper)
    557 {
    558     return RetainPtr<WebAccessibilityObjectWrapper>(wrapper);
    559 }
    560 
    561556- (id)attachmentView
    562557{
    563558    ASSERT(self.axBackingObject->isAttachment());
    564559
    565     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     560    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    566561        auto* widget = protectedSelf.get().axBackingObject->widgetForAttachmentView();
    567562        if (!widget)
    … …  
    12531248- (NSAttributedString*)doAXAttributedStringForTextMarkerRange:(id)textMarkerRange spellCheck:(BOOL)spellCheck
    12541249{
    1255     return Accessibility::retrieveValueFromMainThread<NSAttributedString *>([&textMarkerRange, &spellCheck, protectedSelf = retainWrapper(self)] () -> NSAttributedString * {
     1250    return Accessibility::retrieveValueFromMainThread<NSAttributedString *>([&textMarkerRange, &spellCheck, protectedSelf = retainPtr(self)] () -> NSAttributedString * {
    12561251        auto* backingObject = protectedSelf.get().axBackingObject;
    12571252        if (!backingObject)
    … …  
    12991294- (id)textMarkerRangeFromVisiblePositions:(const VisiblePosition&)startPosition endPosition:(const VisiblePosition&)endPosition
    13001295{
    1301     return Accessibility::retrieveValueFromMainThread<NSAttributedString *>([&startPosition, &endPosition, protectedSelf = retainWrapper(self)] () -> id {
     1296    return Accessibility::retrieveValueFromMainThread<NSAttributedString *>([&startPosition, &endPosition, protectedSelf = retainPtr(self)] () -> id {
    13021297        auto* backingObject = protectedSelf.get().axBackingObject;
    13031298        if (!backingObject)
    … …  
    19201915- (id)associatedPluginParent
    19211916{
    1922     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     1917    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    19231918        auto* backingObject = protectedSelf.get().axBackingObject;
    19241919        if (!backingObject || !backingObject->hasApplePDFAnnotationAttribute())
    … …  
    22902285- (id)windowElement:(NSString*)attributeName
    22912286{
    2292     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([attributeName, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     2287    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([attributeName, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    22932288        id remoteParent = [protectedSelf remoteAccessibilityParentObject];
    22942289        if (remoteParent) {
    … …  
    28252820
    28262821    if ([attributeName isEqualToString:@"AXSelectedTextMarkerRange"]) {
    2827         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     2822        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    28282823            return [protectedSelf textMarkerRangeForSelection];
    28292824        });
    … …  
    28312826
    28322827    if ([attributeName isEqualToString:@"AXStartTextMarker"]) {
    2833         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     2828        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    28342829            if (auto* backingObject = protectedSelf.get().axBackingObject)
    28352830                return [protectedSelf textMarkerForVisiblePosition:startOfDocument(backingObject->document())];
    … …  
    28392834
    28402835    if ([attributeName isEqualToString:@"AXEndTextMarker"]) {
    2841         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     2836        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    28422837            if (auto* backingObject = protectedSelf.get().axBackingObject)
    28432838                return [protectedSelf textMarkerForVisiblePosition:endOfDocument(backingObject->document())];
    … …  
    34073402- (void)accessibilityShowContextMenu
    34083403{
    3409     Accessibility::performFunctionOnMainThread([protectedSelf = retainWrapper(self)] {
     3404    Accessibility::performFunctionOnMainThread([protectedSelf = retainPtr(self)] {
    34103405        [protectedSelf _accessibilityShowContextMenu];
    34113406    });
    … …  
    37843779- (id)textMarkerRangeAtTextMarker:(id)textMarker forUnit:(TextUnit)textUnit
    37853780{
    3786     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     3781    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    37873782        auto* backingObject = protectedSelf.get().axBackingObject;
    37883783        if (!backingObject)
    … …  
    38193814- (id)lineTextMarkerRangeForTextMarker:(id)textMarker forUnit:(TextUnit)textUnit
    38203815{
    3821     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     3816    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    38223817        auto* backingObject = protectedSelf.get().axBackingObject;
    38233818        if (!backingObject)
    … …  
    38513846- (id)textMarkerForTextMarker:(id)textMarker atUnit:(TextUnit)textUnit
    38523847{
    3853     return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     3848    return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, &textUnit, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    38543849        auto* backingObject = protectedSelf.get().axBackingObject;
    38553850        if (!backingObject)
    … …  
    39533948    if ([attribute isEqualToString:NSAccessibilitySelectTextWithCriteriaParameterizedAttribute]) {
    39543949        // To be deprecated.
    3955         auto result = Accessibility::retrieveValueFromMainThread<Vector<String>>([dictionary, protectedSelf = retainWrapper(self)] () -> Vector<String> {
     3950        auto result = Accessibility::retrieveValueFromMainThread<Vector<String>>([dictionary, protectedSelf = retainPtr(self)] () -> Vector<String> {
    39563951            auto* backingObject = protectedSelf.get().axBackingObject;
    39573952            if (!backingObject)
    … …  
    39713966    if ([attribute isEqualToString:NSAccessibilitySearchTextWithCriteriaParameterizedAttribute]) {
    39723967        auto criteria = accessibilitySearchTextCriteriaForParameterizedAttribute(dictionary);
    3973         return Accessibility::retrieveAutoreleasedValueFromMainThread<NSArray *>([&criteria, protectedSelf = retainWrapper(self)] () -> RetainPtr<NSArray> {
     3968        return Accessibility::retrieveAutoreleasedValueFromMainThread<NSArray *>([&criteria, protectedSelf = retainPtr(self)] () -> RetainPtr<NSArray> {
    39743969            auto* backingObject = protectedSelf.get().axBackingObject;
    39753970            if (!backingObject)
    … …  
    39893984
    39903985    if ([attribute isEqualToString:NSAccessibilityTextOperationParameterizedAttribute]) {
    3991         auto operationResult = Accessibility::retrieveValueFromMainThread<Vector<String>>([dictionary, protectedSelf = retainWrapper(self)] () -> Vector<String> {
     3986        auto operationResult = Accessibility::retrieveValueFromMainThread<Vector<String>>([dictionary, protectedSelf = retainPtr(self)] () -> Vector<String> {
    39923987            auto* backingObject = protectedSelf.get().axBackingObject;
    39933988            if (!backingObject)
    … …  
    40204015
    40214016    if ([attribute isEqualToString:NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute]) {
    4022         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&rect, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4017        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&rect, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    40234018            auto* backingObject = protectedSelf.get().axBackingObject;
    40244019            if (!backingObject)
    … …  
    40364031
    40374032    if ([attribute isEqualToString:NSAccessibilityStartTextMarkerForBoundsParameterizedAttribute]) {
    4038         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&rect, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4033        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&rect, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    40394034            auto* backingObject = protectedSelf.get().axBackingObject;
    40404035            if (!backingObject)
    … …  
    40564051    if ([attribute isEqualToString:NSAccessibilityMisspellingTextMarkerRangeParameterizedAttribute]) {
    40574052        auto criteria = accessibilityMisspellingSearchCriteriaForParameterizedAttribute(self, dictionary);
    4058         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&criteria, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4053        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&criteria, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    40594054            auto* backingObject = protectedSelf.get().axBackingObject;
    40604055            if (!backingObject)
    … …  
    40684063
    40694064    if ([attribute isEqualToString:NSAccessibilityTextMarkerIsValidParameterizedAttribute]) {
    4070         bool result = Accessibility::retrieveValueFromMainThread<bool>([&textMarker, protectedSelf = retainWrapper(self)] () -> bool {
     4065        bool result = Accessibility::retrieveValueFromMainThread<bool>([&textMarker, protectedSelf = retainPtr(self)] () -> bool {
    40714066            VisiblePosition pos = [protectedSelf visiblePositionForTextMarker:textMarker];
    40724067            return !pos.isNull();
    … …  
    40764071
    40774072    if ([attribute isEqualToString:NSAccessibilityIndexForTextMarkerParameterizedAttribute]) {
    4078         auto result = Accessibility::retrieveValueFromMainThread<NSInteger>([&textMarker, protectedSelf = retainWrapper(self)] () -> NSInteger {
     4073        auto result = Accessibility::retrieveValueFromMainThread<NSInteger>([&textMarker, protectedSelf = retainPtr(self)] () -> NSInteger {
    40794074            return [protectedSelf _indexForTextMarker:textMarker];
    40804075        });
    … …  
    40834078
    40844079    if ([attribute isEqualToString:NSAccessibilityTextMarkerForIndexParameterizedAttribute]) {
    4085         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&number, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4080        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&number, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    40864081            return [protectedSelf _textMarkerForIndex:[number integerValue]];
    40874082        });
    … …  
    40904085    if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
    40914086        // FIXME: we need to return an IsolatedObject if this is called on the AX thread.
    4092         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4087        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    40934088            auto* axObject = [protectedSelf accessibilityObjectForTextMarker:textMarker];
    40944089            if (!axObject)
    … …  
    41014096
    41024097    if ([attribute isEqualToString:@"AXTextMarkerRangeForUIElement"]) {
    4103         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&uiElement, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4098        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&uiElement, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    41044099            RefPtr<Range> range = uiElement.get()->elementRange();
    41054100            return [protectedSelf textMarkerRangeFromRange:range];
    … …  
    41084103
    41094104    if ([attribute isEqualToString:@"AXLineForTextMarker"]) {
    4110         int result = Accessibility::retrieveValueFromMainThread<int>([&textMarker, protectedSelf = retainWrapper(self)] () -> int {
     4105        int result = Accessibility::retrieveValueFromMainThread<int>([&textMarker, protectedSelf = retainPtr(self)] () -> int {
    41114106            auto* backingObject = protectedSelf.get().axBackingObject;
    41124107            if (!backingObject)
    … …  
    41204115
    41214116    if ([attribute isEqualToString:@"AXTextMarkerRangeForLine"]) {
    4122         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&number, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4117        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&number, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    41234118            auto* backingObject = protectedSelf.get().axBackingObject;
    41244119            VisiblePositionRange vpRange;
    … …  
    41304125
    41314126    if ([attribute isEqualToString:@"AXStringForTextMarkerRange"]) {
    4132         return Accessibility::retrieveValueFromMainThread<String>([&textMarkerRange, protectedSelf = retainWrapper(self)] () -> String {
     4127        return Accessibility::retrieveValueFromMainThread<String>([&textMarkerRange, protectedSelf = retainPtr(self)] () -> String {
    41334128            RefPtr<Range> range = [protectedSelf rangeForTextMarkerRange:textMarkerRange];
    41344129            auto* backingObject = protectedSelf.get().axBackingObject;
    … …  
    41424137            return nil;
    41434138
    4144         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&webCorePoint, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4139        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&webCorePoint, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    41454140            auto* backingObject = protectedSelf.get().axBackingObject;
    41464141            if (!backingObject)
    … …  
    41574152
    41584153    if ([attribute isEqualToString:@"AXBoundsForTextMarkerRange"]) {
    4159         NSRect rect = Accessibility::retrieveValueFromMainThread<NSRect>([&textMarkerRange, protectedSelf = retainWrapper(self)] () -> NSRect {
     4154        NSRect rect = Accessibility::retrieveValueFromMainThread<NSRect>([&textMarkerRange, protectedSelf = retainPtr(self)] () -> NSRect {
    41604155            auto* backingObject = protectedSelf.get().axBackingObject;
    41614156            if (!backingObject)
    … …  
    41704165
    41714166    if ([attribute isEqualToString:NSAccessibilityBoundsForRangeParameterizedAttribute]) {
    4172         NSRect rect = Accessibility::retrieveValueFromMainThread<NSRect>([&range, protectedSelf = retainWrapper(self)] () -> NSRect {
     4167        NSRect rect = Accessibility::retrieveValueFromMainThread<NSRect>([&range, protectedSelf = retainPtr(self)] () -> NSRect {
    41734168            auto* backingObject = protectedSelf.get().axBackingObject;
    41744169            if (!backingObject)
    … …  
    41974192        }
    41984193
    4199         return Accessibility::retrieveValueFromMainThread<String>([&range, protectedSelf = retainWrapper(self)] () -> String {
     4194        return Accessibility::retrieveValueFromMainThread<String>([&range, protectedSelf = retainPtr(self)] () -> String {
    42004195            auto* backingObject = protectedSelf.get().axBackingObject;
    42014196            if (!backingObject)
    … …  
    42454240            return nil;
    42464241
    4247         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker1, &textMarker2, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4242        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker1, &textMarker2, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    42484243            auto* backingObject = protectedSelf.get().axBackingObject;
    42494244            if (!backingObject)
    … …  
    42624257
    42634258    if ([attribute isEqualToString:@"AXNextTextMarkerForTextMarker"]) {
    4264         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4259        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    42654260            CharacterOffset characterOffset = [protectedSelf characterOffsetForTextMarker:textMarker];
    42664261            return [protectedSelf nextTextMarkerForCharacterOffset:characterOffset];
    … …  
    42694264
    42704265    if ([attribute isEqualToString:@"AXPreviousTextMarkerForTextMarker"]) {
    4271         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4266        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    42724267            CharacterOffset characterOffset = [protectedSelf characterOffsetForTextMarker:textMarker];
    42734268            return [protectedSelf previousTextMarkerForCharacterOffset:characterOffset];
    … …  
    43184313
    43194314    if ([attribute isEqualToString:@"AXStyleTextMarkerRangeForTextMarker"]) {
    4320         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4315        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarker, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    43214316            auto* backingObject = protectedSelf.get().axBackingObject;
    43224317            if (!backingObject)
    … …  
    43344329
    43354330    if ([attribute isEqualToString:@"AXLengthForTextMarkerRange"]) {
    4336         int length = Accessibility::retrieveValueFromMainThread<int>([&textMarkerRange, protectedSelf = retainWrapper(self)] () -> int {
     4331        int length = Accessibility::retrieveValueFromMainThread<int>([&textMarkerRange, protectedSelf = retainPtr(self)] () -> int {
    43374332            auto* backingObject = protectedSelf.get().axBackingObject;
    43384333            if (!backingObject)
    … …  
    43494344    // Used only by DumpRenderTree (so far).
    43504345    if ([attribute isEqualToString:@"AXStartTextMarkerForTextMarkerRange"]) {
    4351         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarkerRange, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4346        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarkerRange, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    43524347            RefPtr<Range> range = [protectedSelf rangeForTextMarkerRange:textMarkerRange];
    43534348            return [protectedSelf startOrEndTextMarkerForRange:range isStart:YES];
    … …  
    43564351
    43574352    if ([attribute isEqualToString:@"AXEndTextMarkerForTextMarkerRange"]) {
    4358         return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarkerRange, protectedSelf = retainWrapper(self)] () -> RetainPtr<id> {
     4353        return Accessibility::retrieveAutoreleasedValueFromMainThread<id>([&textMarkerRange, protectedSelf = retainPtr(self)] () -> RetainPtr<id> {
    43594354            RefPtr<Range> range = [protectedSelf rangeForTextMarkerRange:textMarkerRange];
    43604355            return [protectedSelf startOrEndTextMarkerForRange:range isStart:NO];
Note: See TracChangeset for help on using the changeset viewer.