Changeset 259483 in webkit

Timestamp:

Apr 3, 2020 12:50:42 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r8412): Use RetainPtr<> for NSMutableAttributedString in -[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]
<​https://webkit.org/b/209980>

Reviewed by Darin Adler.

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]):
Make use of RetainPtr<>.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-03  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r8412): Use RetainPtr<> for NSMutableAttributedString in -[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]
+        <https://webkit.org/b/209980>
+
+        Reviewed by Darin Adler.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper doAXAttributedStringForTextMarkerRange:spellCheck:]):
+        Make use of RetainPtr<>.
+
 2020-04-03  Kenneth Russell  <kbr@chromium.org>
 

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

@@ -1256 +1256 @@
         if (!range)
             return nil;
-        NSMutableAttributedString* attrString = [[NSMutableAttributedString alloc] init];
+        auto attrString = adoptNS([[NSMutableAttributedString alloc] init]);
         TextIterator it(*range);
         while (!it.atEnd()) {
@@ -1266 +1266 @@
                 String listMarkerText = AccessibilityObject::listMarkerTextForNodeAndPosition(&node, VisiblePosition(createLegacyEditingPosition(it.range().start)));
                 if (!listMarkerText.isEmpty())
-                    AXAttributedStringAppendText(attrString, &node, listMarkerText, spellCheck);
-                AXAttributedStringAppendText(attrString, &node, it.text(), spellCheck);
+                    AXAttributedStringAppendText(attrString.get(), &node, listMarkerText, spellCheck);
+                AXAttributedStringAppendText(attrString.get(), &node, it.text(), spellCheck);
             } else {
                 Node* replacedNode = it.node();
@@ -1282 +1282 @@
                     // add the attachment attribute
                     AccessibilityObject* obj = replacedNode->renderer()->document().axObjectCache()->getOrCreate(replacedNode->renderer());
-                    AXAttributeStringSetElement(attrString, NSAccessibilityAttachmentTextAttribute, obj, attrStringRange);
+                    AXAttributeStringSetElement(attrString.get(), NSAccessibilityAttachmentTextAttribute, obj, attrStringRange);
                 }
             }
@@ -1288 +1288 @@
         }
 
-        return [attrString autorelease];
+        return attrString.autorelease();
     });
 }