From d045878c8a8e757bade3ede23afb697220fca600 Mon Sep 17 00:00:00 2001 From: "marco.zehe%googlemail.com" Date: Tue, 22 Jul 2008 05:07:52 +0000 Subject: [PATCH] bug 440770 - DOCUMENT_FRAME has a parent INTERNAL_FRAME with an action, r=aaronlev, a1.9.0.2=ss git-svn-id: svn://10.0.0.236/trunk@253185 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/base/nsOuterDocAccessible.cpp | 31 +++++++++++++++++++ .../src/base/nsOuterDocAccessible.h | 4 +++ 2 files changed, 35 insertions(+) diff --git a/mozilla/accessible/src/base/nsOuterDocAccessible.cpp b/mozilla/accessible/src/base/nsOuterDocAccessible.cpp index 6e5ea0ea87e..ee1d944b2b4 100644 --- a/mozilla/accessible/src/base/nsOuterDocAccessible.cpp +++ b/mozilla/accessible/src/base/nsOuterDocAccessible.cpp @@ -148,3 +148,34 @@ nsOuterDocAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes } return nsAccessible::GetAttributesInternal(aAttributes); } + +// Internal frame, which is the doc's parent, should not have a click action +NS_IMETHODIMP +nsOuterDocAccessible::GetNumActions(PRUint8 *aNumActions) +{ + NS_ENSURE_ARG_POINTER(aNumActions); + *aNumActions = 0; + + return NS_OK; +} + +NS_IMETHODIMP +nsOuterDocAccessible::GetActionName(PRUint8 aIndex, nsAString& aName) +{ + aName.Truncate(); + + return NS_ERROR_INVALID_ARG; +} + +NS_IMETHODIMP +nsOuterDocAccessible::GetActionDescription(PRUint8 aIndex, nsAString& aDescription) +{ + // default to same as action name. + return GetActionName(aIndex, aDescription); +} + +NS_IMETHODIMP +nsOuterDocAccessible::DoAction(PRUint8 aIndex) +{ + return NS_ERROR_INVALID_ARG; +} diff --git a/mozilla/accessible/src/base/nsOuterDocAccessible.h b/mozilla/accessible/src/base/nsOuterDocAccessible.h index d8b28d3be9d..94b431dd49d 100644 --- a/mozilla/accessible/src/base/nsOuterDocAccessible.h +++ b/mozilla/accessible/src/base/nsOuterDocAccessible.h @@ -58,6 +58,10 @@ class nsOuterDocAccessible : public nsAccessibleWrap nsIAccessible **aAccessible); void CacheChildren(); nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes); + NS_IMETHOD GetNumActions(PRUint8 *aNumActions); + NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName); + NS_IMETHODIMP GetActionDescription(PRUint8 aIndex, nsAString& aDescription); + NS_IMETHOD DoAction(PRUint8 aIndex); }; #endif