WebKit Bugzilla
Attachment 373130 Details for
Bug 199306
: AX: Both convertToNSArray() functions in WebAccessibilityObjectWrapperBase.mm leak every NSMutableArray returned
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
patch (text/plain), 15.63 KB, created by
chris fleizach
on 2019-06-28 10:47:49 PDT
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
chris fleizach
Created:
2019-06-28 10:47:49 PDT
Size:
15.63 KB
patch
obsolete
>Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 246928) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,23 @@ >+2019-06-28 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 David Kilzer. >+ >+ Stop leaking every instance of convertToNSArray and return an autoreleased version. >+ Remove unneeded casts. >+ >+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: >+ (-[WebAccessibilityObjectWrapper accessibilityFindMatchingObjects:]): >+ * accessibility/mac/WebAccessibilityObjectWrapperBase.h: >+ * accessibility/mac/WebAccessibilityObjectWrapperBase.mm: >+ (convertToNSArray): >+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: >+ (-[WebAccessibilityObjectWrapper childrenVectorArray]): >+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]): >+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:forParameter:]): >+ > 2019-06-28 Konstantin Tokarev <annulen@yandex.ru> > > Remove traces of ENABLE_ICONDATABASE remaining after its removal in 219733 >Index: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm >=================================================================== >--- Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (revision 246788) >+++ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (working copy) >@@ -1980,7 +1980,7 @@ > AccessibilitySearchCriteria criteria = accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(parameters); > AccessibilityObject::AccessibilityChildrenVector results; > m_object->findMatchingObjects(&criteria, results); >- return (NSArray *)convertToNSArray(results); >+ return convertToNSArray(results); > } > > - (void)accessibilityModifySelection:(TextGranularity)granularity increase:(BOOL)increase >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 >Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm >=================================================================== >--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (revision 246788) >+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (working copy) >@@ -2001,10 +2001,10 @@ > auto tree = treeNode->tree(); > for (auto childID : nodeChildren) > children.uncheckedAppend(tree->nodeForID(child)); >- return (NSArray *)convertToNSArray(children); >+ return convertToNSArray(children); > } > #endif >- return (NSArray *)convertToNSArray(m_object->children()); >+ return convertToNSArray(m_object->children()); > } > > - (NSValue *)position >@@ -2677,7 +2677,7 @@ > if (m_object->isTreeItem()) { > AccessibilityObject::AccessibilityChildrenVector contentCopy; > m_object->ariaTreeItemContent(contentCopy); >- return (NSArray *)convertToNSArray(contentCopy); >+ return convertToNSArray(contentCopy); > } > > return self.childrenVectorArray; >@@ -2687,7 +2687,7 @@ > if (m_object->canHaveSelectedChildren()) { > AccessibilityObject::AccessibilityChildrenVector selectedChildrenCopy; > m_object->selectedChildren(selectedChildrenCopy); >- return (NSArray *)convertToNSArray(selectedChildrenCopy); >+ return convertToNSArray(selectedChildrenCopy); > } > return nil; > } >@@ -2696,7 +2696,7 @@ > if (m_object->isListBox()) { > AccessibilityObject::AccessibilityChildrenVector visibleChildrenCopy; > m_object->visibleChildren(visibleChildrenCopy); >- return (NSArray *)convertToNSArray(visibleChildrenCopy); >+ return convertToNSArray(visibleChildrenCopy); > } > else if (m_object->isList()) > return [self accessibilityAttributeValue:NSAccessibilityChildrenAttribute]; >@@ -2709,7 +2709,7 @@ > if ([attributeName isEqualToString:@"AXLinkUIElements"]) { > AccessibilityObject::AccessibilityChildrenVector links; > downcast<AccessibilityRenderObject>(*m_object).getDocumentLinks(links); >- return (NSArray *)convertToNSArray(links); >+ return convertToNSArray(links); > } > if ([attributeName isEqualToString:@"AXLoaded"]) > return [NSNumber numberWithBool:m_object->isLoaded()]; >@@ -2925,7 +2925,7 @@ > if (m_object->isTabList()) { > AccessibilityObject::AccessibilityChildrenVector tabsChildren; > m_object->tabChildren(tabsChildren); >- return (NSArray *)convertToNSArray(tabsChildren); >+ return convertToNSArray(tabsChildren); > } > } > >@@ -2935,7 +2935,7 @@ > auto children = self.childrenVectorArray; > AccessibilityObject::AccessibilityChildrenVector tabs; > m_object->tabChildren(tabs); >- auto tabsChildren = (NSArray *)convertToNSArray(tabs); >+ auto tabsChildren = convertToNSArray(tabs); > > NSMutableArray *contents = [NSMutableArray array]; > for (id childWrapper in children) { >@@ -2961,24 +2961,24 @@ > if (is<AccessibilityTable>(*m_object) && downcast<AccessibilityTable>(*m_object).isExposableThroughAccessibility()) { > auto& table = downcast<AccessibilityTable>(*m_object); > if ([attributeName isEqualToString:NSAccessibilityRowsAttribute]) >- return (NSArray *)convertToNSArray(table.rows()); >+ return convertToNSArray(table.rows()); > > if ([attributeName isEqualToString:NSAccessibilityVisibleRowsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector visibleRows; > table.visibleRows(visibleRows); >- return (NSArray *)convertToNSArray(visibleRows); >+ return convertToNSArray(visibleRows); > } > > // TODO: distinguish between visible and non-visible columns > if ([attributeName isEqualToString:NSAccessibilityColumnsAttribute] || > [attributeName isEqualToString:NSAccessibilityVisibleColumnsAttribute]) { >- return (NSArray *)convertToNSArray(table.columns()); >+ return convertToNSArray(table.columns()); > } > > if ([attributeName isEqualToString:NSAccessibilitySelectedRowsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector selectedChildrenCopy; > m_object->selectedChildren(selectedChildrenCopy); >- return (NSArray *)convertToNSArray(selectedChildrenCopy); >+ return convertToNSArray(selectedChildrenCopy); > } > > // HTML tables don't support these >@@ -2989,7 +2989,7 @@ > if ([attributeName isEqualToString:NSAccessibilityColumnHeaderUIElementsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector columnHeaders; > table.columnHeaders(columnHeaders); >- return (NSArray *)convertToNSArray(columnHeaders); >+ return convertToNSArray(columnHeaders); > } > > if ([attributeName isEqualToString:NSAccessibilityHeaderAttribute]) { >@@ -3002,13 +3002,13 @@ > if ([attributeName isEqualToString:NSAccessibilityRowHeaderUIElementsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector rowHeaders; > table.rowHeaders(rowHeaders); >- return (NSArray *)convertToNSArray(rowHeaders); >+ return convertToNSArray(rowHeaders); > } > > if ([attributeName isEqualToString:NSAccessibilityVisibleCellsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector cells; > table.cells(cells); >- return (NSArray *)convertToNSArray(cells); >+ return convertToNSArray(cells); > } > > if ([attributeName isEqualToString:NSAccessibilityColumnCountAttribute]) >@@ -3032,7 +3032,7 @@ > // rows attribute for a column is the list of all the elements in that column at each row > if ([attributeName isEqualToString:NSAccessibilityRowsAttribute] || > [attributeName isEqualToString:NSAccessibilityVisibleRowsAttribute]) { >- return (NSArray *)convertToNSArray(column.children()); >+ return convertToNSArray(column.children()); > } > if ([attributeName isEqualToString:NSAccessibilityHeaderAttribute]) { > AccessibilityObject* header = column.headerObject(); >@@ -3057,12 +3057,12 @@ > if ([attributeName isEqualToString:NSAccessibilityColumnHeaderUIElementsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector columnHeaders; > cell.columnHeaders(columnHeaders); >- return (NSArray *)convertToNSArray(columnHeaders); >+ return convertToNSArray(columnHeaders); > } > if ([attributeName isEqualToString:NSAccessibilityRowHeaderUIElementsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector rowHeaders; > cell.rowHeaders(rowHeaders); >- return (NSArray *)convertToNSArray(rowHeaders); >+ return convertToNSArray(rowHeaders); > } > if ([attributeName isEqualToString:NSAccessibilityARIAColumnIndexAttribute]) > return @(cell.axColumnIndex()); >@@ -3075,12 +3075,12 @@ > if ([attributeName isEqualToString:NSAccessibilitySelectedRowsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector selectedChildrenCopy; > m_object->selectedChildren(selectedChildrenCopy); >- return (NSArray *)convertToNSArray(selectedChildrenCopy); >+ return convertToNSArray(selectedChildrenCopy); > } > if ([attributeName isEqualToString:NSAccessibilityRowsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector rowsCopy; > m_object->ariaTreeRows(rowsCopy); >- return (NSArray *)convertToNSArray(rowsCopy); >+ return convertToNSArray(rowsCopy); > } > > // TreeRoles do not support columns, but Mac AX expects to be able to ask about columns at the least. >@@ -3118,11 +3118,11 @@ > if (m_object->isTreeItem()) { > AccessibilityObject::AccessibilityChildrenVector rowsCopy; > m_object->ariaTreeItemDisclosedRows(rowsCopy); >- return (NSArray *)convertToNSArray(rowsCopy); >+ return convertToNSArray(rowsCopy); > } else if (is<AccessibilityARIAGridRow>(*m_object)) { > AccessibilityObject::AccessibilityChildrenVector rowsCopy; > downcast<AccessibilityARIAGridRow>(*m_object).disclosedRows(rowsCopy); >- return (NSArray *)convertToNSArray(rowsCopy); >+ return convertToNSArray(rowsCopy); > } > } > >@@ -3178,7 +3178,7 @@ > if ([attributeName isEqualToString: NSAccessibilityLinkedUIElementsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector linkedUIElements; > m_object->linkedUIElements(linkedUIElements); >- return (NSArray *)convertToNSArray(linkedUIElements); >+ return convertToNSArray(linkedUIElements); > } > > if ([attributeName isEqualToString: NSAccessibilitySelectedAttribute]) >@@ -3259,7 +3259,7 @@ > if ([attributeName isEqualToString:NSAccessibilityOwnsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector ariaOwns; > m_object->ariaOwnsElements(ariaOwns); >- return (NSArray *)convertToNSArray(ariaOwns); >+ return convertToNSArray(ariaOwns); > } > > if ([attributeName isEqualToString:NSAccessibilityARIAPosInSetAttribute]) >@@ -3401,7 +3401,7 @@ > if ([attributeName isEqualToString:@"AXDetailsElements"]) { > AccessibilityObject::AccessibilityChildrenVector details; > m_object->ariaDetailsElements(details); >- return (NSArray *)convertToNSArray(details); >+ return convertToNSArray(details); > } > > if ([attributeName isEqualToString:NSAccessibilityRelativeFrameAttribute]) >@@ -3410,7 +3410,7 @@ > if ([attributeName isEqualToString:@"AXErrorMessageElements"]) { > AccessibilityObject::AccessibilityChildrenVector errorMessages; > m_object->ariaErrorMessageElements(errorMessages); >- return (NSArray *)convertToNSArray(errorMessages); >+ return convertToNSArray(errorMessages); > } > > // Multi-selectable >@@ -3434,7 +3434,7 @@ > if ([attributeName isEqualToString:NSAccessibilityAriaControlsAttribute]) { > AccessibilityObject::AccessibilityChildrenVector ariaControls; > m_object->ariaControlsElements(ariaControls); >- return (NSArray *)convertToNSArray(ariaControls); >+ return convertToNSArray(ariaControls); > } > > if ([attributeName isEqualToString:NSAccessibilityFocusableAncestorAttribute]) { >@@ -4187,7 +4187,7 @@ > AccessibilitySearchCriteria criteria = accessibilitySearchCriteriaForSearchPredicateParameterizedAttribute(dictionary); > AccessibilityObject::AccessibilityChildrenVector results; > m_object->findMatchingObjects(&criteria, results); >- return (NSArray *)convertToNSArray(results); >+ return convertToNSArray(results); > } > > if ([attribute isEqualToString:NSAccessibilityEndTextMarkerForBoundsParameterizedAttribute]) {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=373130">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 199306
:
373077
| 373130 |
373152