Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 193656 [ATK Accessibility] implement accessible object for block frame

Browse Source 
r=aaronl, sr=henry.jia


git-svn-id: svn://10.0.0.236/trunk@138910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kyle.yuan%sun.com 2003-03-05 02:51:36 +00:00
parent 88d8bee1f3
commit fcde9c769e
10 changed files with 97 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/accessible/public/nsIAccessibilityService.idl
View File

@ -42,7 +42,7 @@ interface nsIAccessibilityService : nsISupports
nsIAccessible createHTML4ButtonAccessible(in nsISupports aFrame);
nsIAccessible createHTMLAreaAccessible(in nsIWeakReference aPresShell, in nsIDOMNode aDOMNode, in nsIAccessible aAccParent);
nsIAccessible createHTMLBlockAccessible(in nsIDOMNode aNode, in nsISupports aDocument);
nsIAccessible createHTMLBlockAccessible(in nsISupports aFrame);
nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
nsIAccessible createHTMLButtonAccessibleXBL(in nsIDOMNode aNode);
nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);

24
mozilla/accessible/src/base/nsAccessibilityService.cpp
View File

@ -433,23 +433,17 @@ nsAccessibilityService::CreateHTMLAreaAccessible(nsIWeakReference *aShell, nsIDO
return NS_OK;
}
NS_IMETHODIMP
nsAccessibilityService::CreateHTMLBlockAccessible(nsIDOMNode* aDOMNode, nsISupports* aDocument, nsIAccessible **_retval)
NS_IMETHODIMP
nsAccessibilityService::CreateHTMLBlockAccessible(nsISupports *aFrame, nsIAccessible **_retval)
{
nsCOMPtr<nsIDocument> document (do_QueryInterface(aDocument));
if (!document)
return NS_ERROR_FAILURE;
nsIFrame* frame;
nsCOMPtr<nsIDOMNode> node;
nsCOMPtr<nsIWeakReference> weakShell;
nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
if (NS_FAILED(rv))
return rv;
#ifdef DEBUG
PRInt32 shells = document->GetNumberOfShells();
NS_ASSERTION(shells > 0,"Error no shells!");
#endif
nsCOMPtr<nsIPresShell> tempShell;
document->GetShellAt(0, getter_AddRefs(tempShell));
nsCOMPtr<nsIWeakReference> weakShell = do_GetWeakReference(tempShell);
*_retval = new nsAccessible(aDOMNode, weakShell);
*_retval = new nsHTMLBlockAccessible(node, weakShell);
if (! *_retval)
return NS_ERROR_OUT_OF_MEMORY;

39
mozilla/accessible/src/html/nsHTMLTextAccessible.cpp
View File

@ -45,13 +45,13 @@ nsTextAccessible(aDomNode, aShell)
{
}
NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAString& _retval)
NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAString& aName)
{
nsAutoString accName;
if (NS_FAILED(mDOMNode->GetNodeValue(accName)))
return NS_ERROR_FAILURE;
accName.CompressWhitespace();
_retval = accName;
aName = accName;
return NS_OK;
}
@ -60,15 +60,40 @@ nsLeafAccessible(aDomNode, aShell)
{
}
NS_IMETHODIMP nsHTMLHRAccessible::GetAccRole(PRUint32 *_retval)
NS_IMETHODIMP nsHTMLHRAccessible::GetAccRole(PRUint32 *aRole)
{
*_retval = ROLE_SEPARATOR;
*aRole = ROLE_SEPARATOR;
return NS_OK;
}
NS_IMETHODIMP nsHTMLHRAccessible::GetAccState(PRUint32 *_retval)
NS_IMETHODIMP nsHTMLHRAccessible::GetAccState(PRUint32 *aState)
{
nsLeafAccessible::GetAccState(_retval);
*_retval &= ~STATE_FOCUSABLE;
nsLeafAccessible::GetAccState(aState);
*aState &= ~STATE_FOCUSABLE;
return NS_OK;
}
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLBlockAccessible, nsBlockAccessible)
nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell):
nsBlockAccessible(aDomNode, aShell)
{
}
NS_IMETHODIMP nsHTMLBlockAccessible::GetAccName(nsAString& aName)
{
return nsAccessible::GetAccName(aName);
}
NS_IMETHODIMP nsHTMLBlockAccessible::GetAccRole(PRUint32 *aRole)
{
*aRole = ROLE_TEXT;
return NS_OK;
}
NS_IMETHODIMP nsHTMLBlockAccessible::GetAccState(PRUint32 *aState)
{
nsAccessible::GetAccState(aState);
*aState &= ~STATE_FOCUSABLE;
return NS_OK;
}

11
mozilla/accessible/src/html/nsHTMLTextAccessible.h
View File

@ -61,4 +61,15 @@ public:
NS_IMETHOD GetAccState(PRUint32 *_retval);
};
class nsHTMLBlockAccessible : public nsBlockAccessible
{
NS_DECL_ISUPPORTS_INHERITED
public:
nsHTMLBlockAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
NS_IMETHOD GetAccName(nsAString& _retval);
NS_IMETHOD GetAccRole(PRUint32 *_retval);
NS_IMETHOD GetAccState(PRUint32 *_retval);
};
#endif

17
mozilla/layout/generic/nsBlockFrame.cpp
View File

@ -75,6 +75,10 @@
#include "nsGUIEvent.h"
#include "nsLayoutErrors.h"
#include "nsAutoPtr.h"
#ifdef MOZ_ACCESSIBILITY_ATK
#include "nsIAccessibilityService.h"
#include "nsIServiceManager.h"
#endif
#ifdef IBMBIDI
#include "nsBidiPresUtils.h"
@ -6687,3 +6691,16 @@ nsBlockFrame::GetDepth() const
return depth;
}
#endif
#ifdef MOZ_ACCESSIBILITY_ATK
NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
{
nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
if (accService) {
return accService->CreateHTMLBlockAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
}
return NS_ERROR_FAILURE;
}
#endif

3
mozilla/layout/generic/nsBlockFrame.h
View File

@ -205,6 +205,9 @@ public:
void UndoSplitPlaceholders(nsBlockReflowState& aState,
nsIFrame* aLastPlaceholder);
#ifdef MOZ_ACCESSIBILITY_ATK
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
#endif
protected:
nsBlockFrame();
virtual ~nsBlockFrame();

2
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -808,6 +808,7 @@ protected:
#ifdef ACCESSIBILITY
NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
{
#ifndef MOZ_ACCESSIBILITY_ATK
if (mRect.width > 0 || mRect.height > 0) {
nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
@ -816,6 +817,7 @@ NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
return accService->CreateHTMLTextAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
}
}
#endif
return NS_ERROR_FAILURE;
}
#endif

17
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -75,6 +75,10 @@
#include "nsGUIEvent.h"
#include "nsLayoutErrors.h"
#include "nsAutoPtr.h"
#ifdef MOZ_ACCESSIBILITY_ATK
#include "nsIAccessibilityService.h"
#include "nsIServiceManager.h"
#endif
#ifdef IBMBIDI
#include "nsBidiPresUtils.h"
@ -6687,3 +6691,16 @@ nsBlockFrame::GetDepth() const
return depth;
}
#endif
#ifdef MOZ_ACCESSIBILITY_ATK
NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
{
nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
if (accService) {
return accService->CreateHTMLBlockAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
}
return NS_ERROR_FAILURE;
}
#endif

3
mozilla/layout/html/base/src/nsBlockFrame.h
View File

@ -205,6 +205,9 @@ public:
void UndoSplitPlaceholders(nsBlockReflowState& aState,
nsIFrame* aLastPlaceholder);
#ifdef MOZ_ACCESSIBILITY_ATK
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
#endif
protected:
nsBlockFrame();
virtual ~nsBlockFrame();

2
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -808,6 +808,7 @@ protected:
#ifdef ACCESSIBILITY
NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
{
#ifndef MOZ_ACCESSIBILITY_ATK
if (mRect.width > 0 || mRect.height > 0) {
nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
@ -816,6 +817,7 @@ NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
return accService->CreateHTMLTextAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
}
}
#endif
return NS_ERROR_FAILURE;
}
#endif