зеркало из https://github.com/mozilla/pjs.git
Bug 334556 crash on startup when GTK accessibility pref enabled
patch by aaronleventhal r=me sr=dbaron
This commit is contained in:
Родитель
a57dc055e0
Коммит
f5a493943c
|
@ -51,17 +51,30 @@ nsRootAccessibleWrap::nsRootAccessibleWrap(nsIDOMNode *aDOMNode,
|
||||||
nsRootAccessible(aDOMNode, aShell)
|
nsRootAccessible(aDOMNode, aShell)
|
||||||
{
|
{
|
||||||
MAI_LOG_DEBUG(("New Root Acc=%p\n", (void*)this));
|
MAI_LOG_DEBUG(("New Root Acc=%p\n", (void*)this));
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP nsRootAccessibleWrap::Init()
|
||||||
|
{
|
||||||
|
nsresult rv = nsRootAccessible::Init();
|
||||||
nsAppRootAccessible *root = nsAppRootAccessible::Create();
|
nsAppRootAccessible *root = nsAppRootAccessible::Create();
|
||||||
if (root)
|
if (root) {
|
||||||
root->AddRootAccessible(this);
|
root->AddRootAccessible(this);
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsRootAccessibleWrap::~nsRootAccessibleWrap()
|
nsRootAccessibleWrap::~nsRootAccessibleWrap()
|
||||||
{
|
{
|
||||||
MAI_LOG_DEBUG(("Delete Root Acc=%p\n", (void*)this));
|
MAI_LOG_DEBUG(("Delete Root Acc=%p\n", (void*)this));
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_IMETHODIMP nsRootAccessibleWrap::Shutdown()
|
||||||
|
{
|
||||||
nsAppRootAccessible *root = nsAppRootAccessible::Create();
|
nsAppRootAccessible *root = nsAppRootAccessible::Create();
|
||||||
if (root)
|
if (root) {
|
||||||
root->RemoveRootAccessible(this);
|
root->RemoveRootAccessible(this);
|
||||||
|
}
|
||||||
|
return nsRootAccessible::Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP nsRootAccessibleWrap::GetParent(nsIAccessible ** aParent)
|
NS_IMETHODIMP nsRootAccessibleWrap::GetParent(nsIAccessible ** aParent)
|
||||||
|
|
|
@ -56,6 +56,8 @@ public:
|
||||||
nsRootAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference* aShell);
|
nsRootAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference* aShell);
|
||||||
virtual ~nsRootAccessibleWrap();
|
virtual ~nsRootAccessibleWrap();
|
||||||
|
|
||||||
|
NS_IMETHOD Init();
|
||||||
|
NS_IMETHOD Shutdown();
|
||||||
NS_IMETHOD GetParent(nsIAccessible ** aParent);
|
NS_IMETHOD GetParent(nsIAccessible ** aParent);
|
||||||
NS_IMETHOD GetRole(PRUint32 *aRole);
|
NS_IMETHOD GetRole(PRUint32 *aRole);
|
||||||
NS_IMETHOD GetExtState(PRUint32 *aState);
|
NS_IMETHOD GetExtState(PRUint32 *aState);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче