Attachment 373077 Details for Bug 199306 – patch

[patch] patch

patch (text/plain), 3.30 KB, created by chris fleizach on 2019-06-27 20:00:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2019-06-27 20:00:03 PDT

Size: 3.30 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246918)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-27  chris fleizach  <cfleizach@apple.com>
>+
>+        AX: Both convertToNSArray() functions in WebAccessibilityObjectWrapperBase.mm leak every NSMutableArray returned
>+        https://bugs.webkit.org/show_bug.cgi?id=199306
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Stop leaking every instance of convertToNSArray and return an autoreleased version. 
>+
>+        * accessibility/mac/WebAccessibilityObjectWrapperBase.h:
>+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
>+        (convertToNSArray):
>+
> 2019-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WinCairo][MediaFoundation] Stop using soft linking for Media Foundation
>Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h
>===================================================================
>--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h	(revision 246788)
>+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h	(working copy)
>@@ -100,9 +100,9 @@
> extern WebCore::AccessibilitySearchCriteria accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(const NSDictionary *);
> 
> #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
>-extern RetainPtr<NSArray> convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>&);
>+extern NSArray *convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>&);
> #endif
>-extern RetainPtr<NSArray> convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector&);
>+extern NSArray *convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector&);
> 
> #if PLATFORM(IOS_FAMILY)
> - (id)_accessibilityWebDocumentView;
>Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
>===================================================================
>--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	(revision 246788)
>+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	(working copy)
>@@ -276,21 +276,21 @@
> }
> 
> #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
>-RetainPtr<NSArray> convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>& children)
>+NSArray *convertToNSArray(const Vector<RefPtr<WebCore::AXIsolatedTreeNode>>& children)
> {
>-    RetainPtr<NSMutableArray> result = [[NSMutableArray alloc] initWithCapacity:children.size()];
>+    NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:children.size()];
>     for (auto& child : children)
>         addChildToArray(*child, result)
>-    return result;
>+    return [result autorelease];
> }
> #endif
> 
>-RetainPtr<NSArray> convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector& children)
>+NSArray *convertToNSArray(const WebCore::AccessibilityObject::AccessibilityChildrenVector& children)
> {
>-    RetainPtr<NSMutableArray> result = [[NSMutableArray alloc] initWithCapacity:children.size()];
>+    NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:children.size()];
>     for (auto& child : children)
>         addChildToArray(*child, result);
>-    return result;
>+    return [result autorelease];
> }
> 
> @implementation WebAccessibilityObjectWrapperBase

Flags:

ddkilzer: review+
ddkilzer: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 199306: 373077 | 373130 | 373152