Skip to content

Commit

Permalink
bug 759033 - nsAccessible -> Accessible and nsAccessibleWrap -> Acces…
Browse files Browse the repository at this point in the history
…sibleWrap r=surkov
  • Loading branch information
Trevor Saunders committed May 29, 2012
1 parent e11db6c commit 8266f18
Show file tree
Hide file tree
Showing 227 changed files with 2,392 additions and 2,350 deletions.
16 changes: 8 additions & 8 deletions accessible/public/nsIAccessibilityService.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "nsAutoPtr.h"

class nsAccessible;
class Accessible;
class nsINode;
class nsIContent;
class nsIDocument;
Expand All @@ -37,8 +37,8 @@ class nsIAccessibilityService : public nsIAccessibleRetrieval
* @param aPresShell [in] the presentation shell which contains layout info
* for the DOM node
*/
virtual nsAccessible* GetAccessible(nsINode* aNode,
nsIPresShell* aPresShell) = 0;
virtual Accessible* GetAccessible(nsINode* aNode,
nsIPresShell* aPresShell) = 0;

/**
* Return root document accessible that is or contains a document accessible
Expand All @@ -48,15 +48,15 @@ class nsIAccessibilityService : public nsIAccessibleRetrieval
* @param aCanCreate [in] points whether the root document accessible
* should be returned from the cache or can be created
*/
virtual nsAccessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
bool aCanCreate) = 0;
virtual Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
bool aCanCreate) = 0;

/**
* Adds/remove ATK root accessible for gtk+ native window to/from children
* of the application accessible.
*/
virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible) = 0;
virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible) = 0;
virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) = 0;
virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) = 0;

/**
* Notification used to update the accessible tree when new content is
Expand Down Expand Up @@ -91,7 +91,7 @@ class nsIAccessibilityService : public nsIAccessibleRetrieval
* @param aEvent [in] accessible event type
* @param aTarget [in] target of accessible event
*/
virtual void FireAccessibleEvent(PRUint32 aEvent, nsAccessible* aTarget) = 0;
virtual void FireAccessibleEvent(PRUint32 aEvent, Accessible* aTarget) = 0;
};

NS_DEFINE_STATIC_IID_ACCESSOR(nsIAccessibilityService,
Expand Down
24 changes: 12 additions & 12 deletions accessible/public/nsIAccessibleText.idl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "nsISupports.idl"

typedef long nsAccessibleTextBoundary;
typedef long AccessibleTextBoundary;

interface nsIAccessible;
interface nsIPersistentProperties;
Expand All @@ -20,14 +20,14 @@ interface nsIAccessibleText : nsISupports
const PRInt32 TEXT_OFFSET_END_OF_TEXT = -1;
const PRInt32 TEXT_OFFSET_CARET = -2;

const nsAccessibleTextBoundary BOUNDARY_CHAR = 0;
const nsAccessibleTextBoundary BOUNDARY_WORD_START = 1;
const nsAccessibleTextBoundary BOUNDARY_WORD_END = 2;
const nsAccessibleTextBoundary BOUNDARY_SENTENCE_START = 3; // don't use, deprecated
const nsAccessibleTextBoundary BOUNDARY_SENTENCE_END = 4; // don't use, deprecated
const nsAccessibleTextBoundary BOUNDARY_LINE_START = 5;
const nsAccessibleTextBoundary BOUNDARY_LINE_END = 6;
const nsAccessibleTextBoundary BOUNDARY_ATTRIBUTE_RANGE = 7;
const AccessibleTextBoundary BOUNDARY_CHAR = 0;
const AccessibleTextBoundary BOUNDARY_WORD_START = 1;
const AccessibleTextBoundary BOUNDARY_WORD_END = 2;
const AccessibleTextBoundary BOUNDARY_SENTENCE_START = 3; // don't use, deprecated
const AccessibleTextBoundary BOUNDARY_SENTENCE_END = 4; // don't use, deprecated
const AccessibleTextBoundary BOUNDARY_LINE_START = 5;
const AccessibleTextBoundary BOUNDARY_LINE_END = 6;
const AccessibleTextBoundary BOUNDARY_ATTRIBUTE_RANGE = 7;

/**
* The current current caret offset.
Expand All @@ -47,17 +47,17 @@ interface nsIAccessibleText : nsISupports
AString getText (in long startOffset, in long endOffset);

AString getTextAfterOffset (in long offset,
in nsAccessibleTextBoundary boundaryType,
in AccessibleTextBoundary boundaryType,
out long startOffset,
out long endOffset);

AString getTextAtOffset (in long offset,
in nsAccessibleTextBoundary boundaryType,
in AccessibleTextBoundary boundaryType,
out long startOffset,
out long endOffset);

AString getTextBeforeOffset (in long offset,
in nsAccessibleTextBoundary boundaryType,
in AccessibleTextBoundary boundaryType,
out long startOffset,
out long endOffset);

Expand Down
Loading

0 comments on commit 8266f18

Please sign in to comment.