Bug 324846. XUL links still being exposed as buttons. r=parente, sr=neil
git-svn-id: svn://10.0.0.236/trunk@188681 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
e594fa0741
commit
b65c6ec082
@ -164,7 +164,6 @@ nsLinkableAccessible::nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference*
|
||||
mIsLink(PR_FALSE),
|
||||
mIsOnclick(PR_FALSE)
|
||||
{
|
||||
CacheActionContent();
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED0(nsLinkableAccessible, nsAccessible)
|
||||
@ -315,6 +314,12 @@ void nsLinkableAccessible::CacheActionContent()
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsLinkableAccessible::Init()
|
||||
{
|
||||
CacheActionContent();
|
||||
return nsAccessibleWrap::Init();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsLinkableAccessible::Shutdown()
|
||||
{
|
||||
mActionContent = nsnull;
|
||||
|
||||
@ -91,6 +91,7 @@ public:
|
||||
NS_IMETHOD GetValue(nsAString& _retval);
|
||||
NS_IMETHOD TakeFocus();
|
||||
NS_IMETHOD GetKeyboardShortcut(nsAString& _retval);
|
||||
NS_IMETHOD Init();
|
||||
NS_IMETHOD Shutdown();
|
||||
|
||||
protected:
|
||||
|
||||
@ -110,7 +110,7 @@ NS_IMETHODIMP nsXULTooltipAccessible::GetRole(PRUint32 *_retval)
|
||||
* For XUL text links
|
||||
*/
|
||||
nsXULLinkAccessible::nsXULLinkAccessible(nsIDOMNode *aDomNode, nsIWeakReference *aShell):
|
||||
nsXULTextAccessible(aDomNode, aShell)
|
||||
nsLinkableAccessible(aDomNode, aShell)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -40,6 +40,7 @@
|
||||
#ifndef _nsXULTextAccessible_H_
|
||||
#define _nsXULTextAccessible_H_
|
||||
|
||||
#include "nsBaseWidgetAccessible.h"
|
||||
#include "nsTextAccessibleWrap.h"
|
||||
|
||||
class nsIWeakReference;
|
||||
@ -64,7 +65,7 @@ public:
|
||||
NS_IMETHOD GetRole(PRUint32 *_retval);
|
||||
};
|
||||
|
||||
class nsXULLinkAccessible : public nsXULTextAccessible
|
||||
class nsXULLinkAccessible : public nsLinkableAccessible
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user