0735a4306d
Found the following memory leaks using Xcode's Instruments application: 1. Posting an NSAccessibilityUIElementDestroyedNotification notification causes [ AquaA11yWrapper isAccessibilityElement ] to be called on the object so mark the object as disposed before posting the destroyed notification and test for disposed in all of the standard NSAccessibility selectors to prevent any calls to likely disposed C++ accessibility objects. 2. In [ AquaA11yWrapper accessibilityHitTest: ], [ AquaA11yFactory wrapperForAccessibleContext: ] already retains the returned object so retaining it until the next call to this selector can lead to a memory leak when dragging selected cells in Calc to a new location. So autorelease the object so that transient objects stay alive but not past the next clearing of the autorelease pool. 3. [ AquaA11ySelectionWrapper selectedChildrenAttributeForElement: ] is expected to return an autoreleased object. 4. [ AquaA11yFactory wrapperForAccessible: ] is not a getter. It expects the caller to release the returned object. 5. CreateNSString() is not a getter. It expects the caller to release the returned string. Change-Id: I824740d7e3851b0c3e31e2c009860aa822c94222 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168034 Reviewed-by: Patrick Luby <guibomacdev@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
192 lines
9.5 KiB
Text
192 lines
9.5 KiB
Text
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
|
|
#include <osx/salinst.h>
|
|
#include <osx/a11yfactory.h>
|
|
#include <osx/a11yfocustracker.hxx>
|
|
|
|
#include "a11yfocuslistener.hxx"
|
|
#include "a11yrolehelper.h"
|
|
#include "a11ywrapperbutton.h"
|
|
#include "a11ywrapperstatictext.h"
|
|
#include "a11ywrappertextarea.h"
|
|
#include "a11ywrappercheckbox.h"
|
|
#include "a11ywrappercombobox.h"
|
|
#include "a11ywrappergroup.h"
|
|
#include "a11ywrapperlist.h"
|
|
#include "a11ywrapperradiobutton.h"
|
|
#include "a11ywrapperradiogroup.h"
|
|
#include "a11ywrapperrow.h"
|
|
#include "a11ywrapperscrollarea.h"
|
|
#include "a11ywrapperscrollbar.h"
|
|
#include "a11ywrappersplitter.h"
|
|
#include "a11ywrappertabgroup.h"
|
|
#include "a11ywrappertoolbar.h"
|
|
#include "a11ytablewrapper.h"
|
|
|
|
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
|
|
|
|
using namespace ::com::sun::star::accessibility;
|
|
using namespace ::com::sun::star::uno;
|
|
|
|
static bool enabled = false;
|
|
|
|
@implementation AquaA11yFactory : NSObject
|
|
|
|
#pragma mark -
|
|
#pragma mark Wrapper Repository
|
|
|
|
+(NSMutableDictionary *)allWrapper {
|
|
static NSMutableDictionary * mdAllWrapper = nil;
|
|
if ( mdAllWrapper == nil ) {
|
|
mdAllWrapper = [ [ [ NSMutableDictionary alloc ] init ] retain ];
|
|
// initialize keyboard focus tracker
|
|
rtl::Reference< AquaA11yFocusListener > listener( AquaA11yFocusListener::get() );
|
|
TheAquaA11yFocusTracker().setFocusListener(listener);
|
|
enabled = true;
|
|
}
|
|
return mdAllWrapper;
|
|
}
|
|
|
|
+(NSValue *)keyForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext {
|
|
return [ NSValue valueWithPointer: rxAccessibleContext.get() ];
|
|
}
|
|
|
|
+(NSValue *)keyForAccessibleContextAsRadioGroup: (Reference < XAccessibleContext >) rxAccessibleContext {
|
|
return [ NSValue valueWithPointer: ( rxAccessibleContext.get() + 2 ) ];
|
|
}
|
|
|
|
+(AquaA11yWrapper *)wrapperForAccessible: (Reference < XAccessible >) rxAccessible {
|
|
if ( rxAccessible.is() ) {
|
|
Reference< XAccessibleContext > xAccessibleContext = rxAccessible->getAccessibleContext();
|
|
if( xAccessibleContext.is() ) {
|
|
return [ AquaA11yFactory wrapperForAccessibleContext: xAccessibleContext ];
|
|
}
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext {
|
|
return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: YES asRadioGroup: NO ];
|
|
}
|
|
|
|
+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate {
|
|
return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: bCreate asRadioGroup: NO ];
|
|
}
|
|
|
|
+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup{
|
|
NSMutableDictionary * dAllWrapper = [ AquaA11yFactory allWrapper ];
|
|
NSValue * nKey = nil;
|
|
if ( asRadioGroup ) {
|
|
nKey = [ AquaA11yFactory keyForAccessibleContextAsRadioGroup: rxAccessibleContext ];
|
|
} else {
|
|
nKey = [ AquaA11yFactory keyForAccessibleContext: rxAccessibleContext ];
|
|
}
|
|
AquaA11yWrapper * aWrapper = static_cast<AquaA11yWrapper *>([ dAllWrapper objectForKey: nKey ]);
|
|
if ( aWrapper != nil ) {
|
|
[ aWrapper retain ];
|
|
} else if ( bCreate ) {
|
|
NSString * nativeRole = [ AquaA11yRoleHelper getNativeRoleFrom: rxAccessibleContext.get() ];
|
|
// TODO: reflection
|
|
if ( [ nativeRole isEqualToString: NSAccessibilityButtonRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperButton alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityTextAreaRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperTextArea alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityStaticTextRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperStaticText alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityComboBoxRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperComboBox alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityGroupRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperGroup alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityToolbarRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperToolbar alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityScrollAreaRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperScrollArea alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityTabGroupRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperTabGroup alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityScrollBarRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperScrollBar alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityCheckBoxRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperCheckBox alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityRadioGroupRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperRadioGroup alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityRadioButtonRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperRadioButton alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityRowRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperRow alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityListRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperList alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilitySplitterRole ] ) {
|
|
aWrapper = [ [ AquaA11yWrapperSplitter alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else if ( [ nativeRole isEqualToString: NSAccessibilityTableRole ] ) {
|
|
aWrapper = [ [ AquaA11yTableWrapper alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
} else {
|
|
aWrapper = [ [ AquaA11yWrapper alloc ] initWithAccessibleContext: rxAccessibleContext ];
|
|
}
|
|
[ aWrapper setActsAsRadioGroup: asRadioGroup ];
|
|
#if 0
|
|
/* #i102033# NSAccessibility does not seemt to know an equivalent for transient children.
|
|
That means we need to cache this, else e.g. tree list boxes are not accessible (moreover
|
|
it crashes by notifying dead objects - which would seemt o be another bug)
|
|
|
|
FIXME:
|
|
Unfortunately this can increase memory consumption drastically until the non transient parent
|
|
is destroyed and finally all the transients are released.
|
|
*/
|
|
if ( ! (rxAccessibleContext -> getAccessibleStateSet() & AccessibleStateType::TRANSIENT ) )
|
|
#endif
|
|
{
|
|
[ dAllWrapper setObject: aWrapper forKey: nKey ];
|
|
}
|
|
}
|
|
return aWrapper;
|
|
}
|
|
|
|
+(void)insertIntoWrapperRepository: (AquaA11yWrapper *) element forAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext {
|
|
NSMutableDictionary * dAllWrapper = [ AquaA11yFactory allWrapper ];
|
|
[ dAllWrapper setObject: element forKey: [ AquaA11yFactory keyForAccessibleContext: rxAccessibleContext ] ];
|
|
}
|
|
|
|
+(void)removeFromWrapperRepositoryFor: (css::uno::Reference < css::accessibility::XAccessibleContext >) rxAccessibleContext {
|
|
// TODO: when RADIO_BUTTON search for associated RadioGroup-wrapper and delete that as well
|
|
AquaA11yWrapper * theWrapper = [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: NO ];
|
|
if ( theWrapper != nil ) {
|
|
[ [ AquaA11yFactory allWrapper ] removeObjectForKey: [ AquaA11yFactory keyForAccessibleContext: rxAccessibleContext ] ];
|
|
[ theWrapper setDisposed ];
|
|
[ theWrapper release ];
|
|
}
|
|
}
|
|
|
|
+(void)registerWrapper: (AquaA11yWrapper *) theWrapper {
|
|
if ( enabled && theWrapper ) {
|
|
// insertIntoWrapperRepository gets called from SalFrameView itself to bootstrap the bridge initially
|
|
[ theWrapper accessibleContext ];
|
|
}
|
|
}
|
|
|
|
+(void)revokeWrapper: (AquaA11yWrapper *) theWrapper {
|
|
if ( enabled && theWrapper ) {
|
|
[ AquaA11yFactory removeFromWrapperRepositoryFor: [ theWrapper accessibleContext ] ];
|
|
}
|
|
}
|
|
|
|
@end
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|