wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1117037 - Mark virtual overridden functions as MOZ_OVERRIDE in accessible/; r=tbsaunde

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-02 01:11:21 -05:00
parent 7ad28dd1b2
commit d3012b47e0
29 changed files with 302 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accessible/base/nsAccessibilityService.h
View File

@ -63,7 +63,7 @@ public:
// nsIAccessibilityService
virtual Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
bool aCanCreate);
bool aCanCreate) MOZ_OVERRIDE;
already_AddRefed<Accessible>
CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent,
Accessible* aContext);
@ -72,8 +72,8 @@ public:
* Adds/remove ATK root accessible for gtk+ native window to/from children
* of the application accessible.
*/
virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible);
virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible);
virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) MOZ_OVERRIDE;
virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) MOZ_OVERRIDE;
virtual bool HasAccessible(nsIDOMNode* aDOMNode) MOZ_OVERRIDE;
@ -144,7 +144,7 @@ public:
*/
void RecreateAccessible(nsIPresShell* aPresShell, nsIContent* aContent);
virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget);
virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget) MOZ_OVERRIDE;
// nsAccessibiltiyService

42
accessible/generic/ARIAGridAccessible.h
View File

@ -25,27 +25,27 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableAccessible* AsTable() { return this; }
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
// TableAccessible
virtual uint32_t ColCount();
virtual uint32_t RowCount();
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex);
virtual bool IsColSelected(uint32_t aColIdx);
virtual bool IsRowSelected(uint32_t aRowIdx);
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx);
virtual uint32_t SelectedCellCount();
virtual uint32_t SelectedColCount();
virtual uint32_t SelectedRowCount();
virtual void SelectedCells(nsTArray<Accessible*>* aCells);
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells);
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols);
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows);
virtual void SelectCol(uint32_t aColIdx);
virtual void SelectRow(uint32_t aRowIdx);
virtual void UnselectCol(uint32_t aColIdx);
virtual void UnselectRow(uint32_t aRowIdx);
virtual Accessible* AsAccessible() { return this; }
virtual uint32_t ColCount() MOZ_OVERRIDE;
virtual uint32_t RowCount() MOZ_OVERRIDE;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE;
virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE;
virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual uint32_t SelectedCellCount() MOZ_OVERRIDE;
virtual uint32_t SelectedColCount() MOZ_OVERRIDE;
virtual uint32_t SelectedRowCount() MOZ_OVERRIDE;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) MOZ_OVERRIDE;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) MOZ_OVERRIDE;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) MOZ_OVERRIDE;
virtual void SelectCol(uint32_t aColIdx) MOZ_OVERRIDE;
virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual void UnselectCol(uint32_t aColIdx) MOZ_OVERRIDE;
virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; }
protected:
virtual ~ARIAGridAccessible() {}
@ -85,8 +85,8 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableCellAccessible* AsTableCell() { return this; }
virtual void ApplyARIAState(uint64_t* aState) const;
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
protected:

24
accessible/generic/ApplicationAccessible.h
View File

@ -35,27 +35,27 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
virtual nsIntRect Bounds() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual GroupPos GroupPosition();
virtual ENameValueFlag Name(nsString& aName);
virtual void ApplyARIAState(uint64_t* aState) const;
virtual void Description(nsString& aDescription);
virtual void Value(nsString& aValue);
virtual GroupPos GroupPosition() MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t State() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
virtual Accessible* FocusedChild();
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual Accessible* FocusedChild() MOZ_OVERRIDE;
virtual void InvalidateChildren();
virtual void InvalidateChildren() MOZ_OVERRIDE;
// ActionAccessible
virtual KeyBinding AccessKey() const;
virtual KeyBinding AccessKey() const MOZ_OVERRIDE;
// ApplicationAccessible
void AppName(nsAString& aName) const
@ -88,9 +88,9 @@ protected:
virtual ~ApplicationAccessible() {}
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult *aError = nullptr) const;
nsresult *aError = nullptr) const MOZ_OVERRIDE;
private:
nsCOMPtr<nsIXULAppInfo> mAppInfo;

12
accessible/generic/BaseAccessibles.h
View File

@ -34,7 +34,7 @@ public:
// Accessible
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL;
virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE MOZ_FINAL;
@ -42,7 +42,7 @@ protected:
virtual ~LeafAccessible() {}
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
};
/**
@ -70,17 +70,17 @@ public:
virtual uint8_t ActionCount() MOZ_OVERRIDE;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE;
virtual bool DoAction(uint8_t index) MOZ_OVERRIDE;
virtual KeyBinding AccessKey() const;
virtual KeyBinding AccessKey() const MOZ_OVERRIDE;
// HyperLinkAccessible
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex);
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
protected:
virtual ~LinkableAccessible() {}
// Accessible
virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent);
virtual void UnbindFromParent();
virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent) MOZ_OVERRIDE;
virtual void UnbindFromParent() MOZ_OVERRIDE;
/**
* Parent accessible that provides an action for this linkable accessible.

28
accessible/generic/DocAccessible.h
View File

@ -56,39 +56,39 @@ public:
nsIPresShell* aPresShell);
// nsIScrollPositionListener
virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) {}
virtual void ScrollPositionDidChange(nscoord aX, nscoord aY);
virtual void ScrollPositionWillChange(nscoord aX, nscoord aY) MOZ_OVERRIDE {}
virtual void ScrollPositionDidChange(nscoord aX, nscoord aY) MOZ_OVERRIDE;
// nsIDocumentObserver
NS_DECL_NSIDOCUMENTOBSERVER
// Accessible
virtual void Init();
virtual void Shutdown();
virtual nsIFrame* GetFrame() const;
virtual nsINode* GetNode() const { return mDocumentNode; }
virtual void Shutdown() MOZ_OVERRIDE;
virtual nsIFrame* GetFrame() const MOZ_OVERRIDE;
virtual nsINode* GetNode() const MOZ_OVERRIDE { return mDocumentNode; }
nsIDocument* DocumentNode() const { return mDocumentNode; }
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
virtual void Description(nsString& aDescription);
virtual Accessible* FocusedChild();
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual Accessible* FocusedChild() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual bool NativelyUnavailable() const;
virtual void ApplyARIAState(uint64_t* aState) const;
virtual already_AddRefed<nsIPersistentProperties> Attributes();
virtual bool NativelyUnavailable() const MOZ_OVERRIDE;
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> Attributes() MOZ_OVERRIDE;
virtual void TakeFocus() MOZ_OVERRIDE;
#ifdef A11Y_LOG
virtual nsresult HandleAccEvent(AccEvent* aEvent);
virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE;
#endif
virtual nsRect RelativeBounds(nsIFrame** aRelativeFrame) const MOZ_OVERRIDE;
// HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const;
virtual already_AddRefed<nsIEditor> GetEditor() const MOZ_OVERRIDE;
// DocAccessible
@ -344,7 +344,7 @@ protected:
void LastRelease();
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
// DocAccessible
virtual nsresult AddEventListeners();

8
accessible/generic/FormControlAccessible.h
View File

@ -28,7 +28,7 @@ public:
}
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
@ -40,7 +40,7 @@ public:
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
protected:
virtual ~ProgressMeterAccessible() {}
@ -56,7 +56,7 @@ public:
RadioButtonAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole();
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
@ -66,7 +66,7 @@ public:
enum { eAction_Click = 0 };
// Widgets
virtual bool IsWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
};
} // namespace a11y

6
accessible/generic/HyperTextAccessible.h
View File

@ -54,13 +54,13 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual int32_t GetLevelInternal();
virtual int32_t GetLevelInternal() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual void InvalidateChildren();
virtual bool RemoveChild(Accessible* aAccessible);
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
// HyperTextAccessible (static helper method)

12
accessible/generic/OuterDocAccessible.h
View File

@ -28,20 +28,20 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual void InvalidateChildren();
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible);
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
protected:
virtual ~OuterDocAccessible();
virtual ~OuterDocAccessible() MOZ_OVERRIDE;
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
};
} // namespace a11y

12
accessible/generic/RootAccessible.h
View File

@ -26,13 +26,13 @@ public:
nsIPresShell* aPresShell);
// nsIDOMEventListener
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
// Accessible
virtual void Shutdown();
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
virtual void Shutdown() MOZ_OVERRIDE;
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole();
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
// RootAccessible
@ -48,8 +48,8 @@ protected:
/**
* Add/remove DOM event listeners.
*/
virtual nsresult AddEventListeners();
virtual nsresult RemoveEventListeners();
virtual nsresult AddEventListeners() MOZ_OVERRIDE;
virtual nsresult RemoveEventListeners() MOZ_OVERRIDE;
/**
* Process the DOM event.

6
accessible/generic/TextLeafAccessible.h
View File

@ -23,8 +23,8 @@ public:
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0,
uint32_t aLength = UINT32_MAX);
virtual ENameValueFlag Name(nsString& aName);
uint32_t aLength = UINT32_MAX) MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
// TextLeafAccessible
void SetText(const nsAString& aText) { mText = aText; }
@ -32,7 +32,7 @@ public:
protected:
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
protected:
nsString mText;

24
accessible/html/HTMLFormControlAccessible.h
View File

@ -36,7 +36,7 @@ public:
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState();
virtual uint64_t NativeState() MOZ_OVERRIDE;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
@ -44,7 +44,7 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
};
@ -66,7 +66,7 @@ public:
// Accessible
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual void GetPositionAndSizeInternal(int32_t *aPosInSet,
int32_t *aSetSize);
int32_t *aSetSize) MOZ_OVERRIDE;
};
@ -93,7 +93,7 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
protected:
// Accessible
@ -116,11 +116,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const;
virtual already_AddRefed<nsIEditor> GetEditor() const MOZ_OVERRIDE;
// Accessible
virtual void Value(nsString& aValue);
virtual void ApplyARIAState(uint64_t* aState) const;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
@ -131,8 +131,8 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual Accessible* ContainerWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
virtual ~HTMLTextFieldAccessible() {}
@ -157,7 +157,7 @@ public:
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual nsresult HandleAccEvent(AccEvent* aAccEvent);
virtual nsresult HandleAccEvent(AccEvent* aAccEvent) MOZ_OVERRIDE;
};
@ -198,7 +198,7 @@ public:
}
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
// Value
@ -209,7 +209,7 @@ public:
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
};

18
accessible/html/HTMLImageMapAccessible.h
View File

@ -28,9 +28,9 @@ public:
virtual a11y::role NativeRole() MOZ_OVERRIDE;
// HyperLinkAccessible
virtual uint32_t AnchorCount();
virtual Accessible* AnchorAt(uint32_t aAnchorIndex);
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex);
virtual uint32_t AnchorCount() MOZ_OVERRIDE;
virtual Accessible* AnchorAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
/**
* Update area children of the image map.
@ -46,7 +46,7 @@ protected:
virtual ~HTMLImageMapAccessible() { }
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
};
/**
@ -59,19 +59,19 @@ public:
HTMLAreaAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Description(nsString& aDescription);
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE;
// HyperLinkAccessible
virtual uint32_t StartOffset();
virtual uint32_t EndOffset();
virtual uint32_t StartOffset() MOZ_OVERRIDE;
virtual uint32_t EndOffset() MOZ_OVERRIDE;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
};

6
accessible/html/HTMLLinkAccessible.h
View File

@ -19,7 +19,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeLinkState() const MOZ_OVERRIDE;
@ -31,8 +31,8 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// HyperLinkAccessible
virtual bool IsLink();
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex);
virtual bool IsLink() MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
protected:
virtual ~HTMLLinkAccessible() {}

10
accessible/html/HTMLListAccessible.h
View File

@ -48,7 +48,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
virtual nsIntRect Bounds() const MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
@ -61,7 +61,7 @@ protected:
virtual ~HTMLLIAccessible() { }
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
private:
nsRefPtr<HTMLListBulletAccessible> mBullet;
@ -78,12 +78,12 @@ public:
virtual ~HTMLListBulletAccessible() { }
// Accessible
virtual nsIFrame* GetFrame() const;
virtual ENameValueFlag Name(nsString& aName);
virtual nsIFrame* GetFrame() const MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0,
uint32_t aLength = UINT32_MAX);
uint32_t aLength = UINT32_MAX) MOZ_OVERRIDE;
// HTMLListBulletAccessible

46
accessible/html/HTMLSelectAccessible.h
View File

@ -43,20 +43,20 @@ public:
virtual uint64_t NativeState() MOZ_OVERRIDE;
// SelectAccessible
virtual bool SelectAll();
virtual bool UnselectAll();
virtual bool SelectAll() MOZ_OVERRIDE;
virtual bool UnselectAll() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* CurrentItem();
virtual void SetCurrentItem(Accessible* aItem);
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* CurrentItem() MOZ_OVERRIDE;
virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE;
protected:
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
};
/*
@ -75,7 +75,7 @@ public:
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual int32_t GetLevelInternal();
virtual int32_t GetLevelInternal() MOZ_OVERRIDE;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE;
virtual void SetSelected(bool aSelect) MOZ_OVERRIDE;
@ -85,7 +85,7 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
// Accessible
@ -168,12 +168,12 @@ public:
virtual ~HTMLComboboxAccessible() {}
// Accessible
virtual void Shutdown();
virtual void Description(nsString& aDescription);
virtual void Value(nsString& aValue);
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual void InvalidateChildren();
virtual void InvalidateChildren() MOZ_OVERRIDE;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
@ -181,15 +181,15 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* CurrentItem();
virtual void SetCurrentItem(Accessible* aItem);
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* CurrentItem() MOZ_OVERRIDE;
virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE;
protected:
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
/**
* Return selected option.
@ -214,14 +214,14 @@ public:
virtual ~HTMLComboboxListAccessible() {}
// Accessible
virtual nsIFrame* GetFrame() const;
virtual nsIFrame* GetFrame() const MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE;
// Widgets
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
};
} // namespace a11y

62
accessible/html/HTMLTableAccessible.h
View File

@ -29,7 +29,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableCellAccessible* AsTableCell() { return this; }
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
@ -119,38 +119,38 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// TableAccessible
virtual Accessible* Caption() const;
virtual void Summary(nsString& aSummary);
virtual uint32_t ColCount();
virtual uint32_t RowCount();
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex);
virtual int32_t CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx);
virtual int32_t ColIndexAt(uint32_t aCellIdx);
virtual int32_t RowIndexAt(uint32_t aCellIdx);
virtual Accessible* Caption() const MOZ_OVERRIDE;
virtual void Summary(nsString& aSummary) MOZ_OVERRIDE;
virtual uint32_t ColCount() MOZ_OVERRIDE;
virtual uint32_t RowCount() MOZ_OVERRIDE;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE;
virtual int32_t CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual int32_t ColIndexAt(uint32_t aCellIdx) MOZ_OVERRIDE;
virtual int32_t RowIndexAt(uint32_t aCellIdx) MOZ_OVERRIDE;
virtual void RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx,
int32_t* aColIdx);
virtual uint32_t ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx);
virtual uint32_t RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx);
virtual bool IsColSelected(uint32_t aColIdx);
virtual bool IsRowSelected(uint32_t aRowIdx);
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx);
virtual uint32_t SelectedCellCount();
virtual uint32_t SelectedColCount();
virtual uint32_t SelectedRowCount();
virtual void SelectedCells(nsTArray<Accessible*>* aCells);
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells);
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols);
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows);
virtual void SelectCol(uint32_t aColIdx);
virtual void SelectRow(uint32_t aRowIdx);
virtual void UnselectCol(uint32_t aColIdx);
virtual void UnselectRow(uint32_t aRowIdx);
virtual bool IsProbablyLayoutTable();
virtual Accessible* AsAccessible() { return this; }
int32_t* aColIdx) MOZ_OVERRIDE;
virtual uint32_t ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual uint32_t RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE;
virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual uint32_t SelectedCellCount() MOZ_OVERRIDE;
virtual uint32_t SelectedColCount() MOZ_OVERRIDE;
virtual uint32_t SelectedRowCount() MOZ_OVERRIDE;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) MOZ_OVERRIDE;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) MOZ_OVERRIDE;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) MOZ_OVERRIDE;
virtual void SelectCol(uint32_t aColIdx) MOZ_OVERRIDE;
virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual void UnselectCol(uint32_t aColIdx) MOZ_OVERRIDE;
virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual bool IsProbablyLayoutTable() MOZ_OVERRIDE;
virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; }
// Accessible
virtual TableAccessible* AsTable() { return this; }
virtual void Description(nsString& aDescription);
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
@ -161,7 +161,7 @@ protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
// HTMLTableAccessible

8
accessible/mac/AccessibleWrap.h
View File

@ -45,13 +45,13 @@ public: // construction, destruction
*/
virtual Class GetNativeType ();
virtual void Shutdown ();
virtual void InvalidateChildren();
virtual void Shutdown () MOZ_OVERRIDE;
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible);
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
virtual nsresult HandleAccEvent(AccEvent* aEvent);
virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE;
/**
* Ignored means that the accessible might still have children, but is not

6
accessible/xul/XULAlertAccessible.h
View File

@ -23,13 +23,13 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName);
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual Accessible* ContainerWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
~XULAlertAccessible();

10
accessible/xul/XULColorPickerAccessible.h
View File

@ -21,13 +21,13 @@ public:
DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
// Widgets
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
};
@ -44,9 +44,9 @@ public:
virtual uint64_t NativeState() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE;
};

12
accessible/xul/XULComboboxAccessible.h
View File

@ -22,11 +22,11 @@ public:
XULComboboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Description(nsString& aDescription);
virtual void Value(nsString& aValue);
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState();
virtual bool CanHaveAnonChildren();
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
@ -34,8 +34,8 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
};
} // namespace a11y

12
accessible/xul/XULElementAccessibles.h
View File

@ -23,7 +23,7 @@ public:
XULLabelAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
@ -86,7 +86,7 @@ public:
XULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeLinkState() const MOZ_OVERRIDE;
@ -96,10 +96,10 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// HyperLinkAccessible
virtual bool IsLink();
virtual uint32_t StartOffset();
virtual uint32_t EndOffset();
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex);
virtual bool IsLink() MOZ_OVERRIDE;
virtual uint32_t StartOffset() MOZ_OVERRIDE;
virtual uint32_t EndOffset() MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
protected:
virtual ~XULLinkAccessible();

16
accessible/xul/XULFormControlAccessible.h
View File

@ -45,10 +45,10 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* ContainerWidget() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE;
@ -132,7 +132,7 @@ public:
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
// Widgets
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
};
/**
@ -148,9 +148,9 @@ public:
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
};
/**

52
accessible/xul/XULListboxAccessible.h
View File

@ -64,35 +64,35 @@ public:
XULListboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// TableAccessible
virtual uint32_t ColCount();
virtual uint32_t RowCount();
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex);
virtual bool IsColSelected(uint32_t aColIdx);
virtual bool IsRowSelected(uint32_t aRowIdx);
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx);
virtual uint32_t SelectedCellCount();
virtual uint32_t SelectedColCount();
virtual uint32_t SelectedRowCount();
virtual void SelectedCells(nsTArray<Accessible*>* aCells);
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells);
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols);
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows);
virtual void SelectRow(uint32_t aRowIdx);
virtual void UnselectRow(uint32_t aRowIdx);
virtual Accessible* AsAccessible() { return this; }
virtual uint32_t ColCount() MOZ_OVERRIDE;
virtual uint32_t RowCount() MOZ_OVERRIDE;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE;
virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE;
virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual uint32_t SelectedCellCount() MOZ_OVERRIDE;
virtual uint32_t SelectedColCount() MOZ_OVERRIDE;
virtual uint32_t SelectedRowCount() MOZ_OVERRIDE;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) MOZ_OVERRIDE;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) MOZ_OVERRIDE;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) MOZ_OVERRIDE;
virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; }
// Accessible
virtual void Value(nsString& aValue);
virtual TableAccessible* AsTable() { return this; }
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
virtual ~XULListboxAccessible() {}
@ -113,17 +113,17 @@ public:
XULListitemAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Description(nsString& aDesc);
virtual void Description(nsString& aDesc) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren();
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
// Actions
virtual void ActionNameAt(uint8_t index, nsAString& aName) MOZ_OVERRIDE;
// Widgets
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
virtual ~XULListitemAccessible();
@ -155,7 +155,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableCellAccessible* AsTableCell() { return this; }
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;

32
accessible/xul/XULMenuAccessible.h
View File

@ -24,25 +24,25 @@ public:
XULMenuitemAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Description(nsString& aDescription);
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual int32_t GetLevelInternal();
virtual int32_t GetLevelInternal() MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren();
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) MOZ_OVERRIDE;
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
virtual KeyBinding AccessKey() const;
virtual KeyBinding KeyboardShortcut() const;
virtual KeyBinding AccessKey() const MOZ_OVERRIDE;
virtual KeyBinding KeyboardShortcut() const MOZ_OVERRIDE;
// Widgets
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* ContainerWidget() const;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
// Accessible
@ -85,11 +85,11 @@ public:
virtual uint64_t NativeState() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
protected:
// Accessible
@ -108,10 +108,10 @@ public:
virtual a11y::role NativeRole() MOZ_OVERRIDE;
// Widget
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* CurrentItem();
virtual void SetCurrentItem(Accessible* aItem);
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* CurrentItem() MOZ_OVERRIDE;
virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE;
protected:
// Accessible

20
accessible/xul/XULSelectControlAccessible.h
View File

@ -23,21 +23,21 @@ public:
virtual ~XULSelectControlAccessible() {}
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
// SelectAccessible
virtual void SelectedItems(nsTArray<Accessible*>* aItems) MOZ_OVERRIDE;
virtual uint32_t SelectedItemCount();
virtual Accessible* GetSelectedItem(uint32_t aIndex);
virtual bool IsItemSelected(uint32_t aIndex);
virtual bool AddItemToSelection(uint32_t aIndex);
virtual bool RemoveItemFromSelection(uint32_t aIndex);
virtual bool SelectAll();
virtual bool UnselectAll();
virtual uint32_t SelectedItemCount() MOZ_OVERRIDE;
virtual Accessible* GetSelectedItem(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool IsItemSelected(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool AddItemToSelection(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool RemoveItemFromSelection(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool SelectAll() MOZ_OVERRIDE;
virtual bool UnselectAll() MOZ_OVERRIDE;
// Widgets
virtual Accessible* CurrentItem();
virtual void SetCurrentItem(Accessible* aItem);
virtual Accessible* CurrentItem() MOZ_OVERRIDE;
virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE;
protected:
// nsIDOMXULMultiSelectControlElement inherits from this, so we'll always have

6
accessible/xul/XULSliderAccessible.h
View File

@ -22,11 +22,11 @@ public:
XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual bool NativelyUnavailable() const;
virtual bool CanHaveAnonChildren();
virtual bool NativelyUnavailable() const MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
// Value
virtual double MaxValue() const MOZ_OVERRIDE;

2
accessible/xul/XULTabAccessible.h
View File

@ -45,7 +45,7 @@ public:
XULTabsAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue);
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
// ActionAccessible

46
accessible/xul/XULTreeAccessible.h
View File

@ -39,12 +39,12 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XULTreeAccessible, Accessible)
// Accessible
virtual void Shutdown();
virtual void Value(nsString& aValue);
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t ChildCount() const MOZ_OVERRIDE;
@ -52,22 +52,22 @@ public:
// SelectAccessible
virtual void SelectedItems(nsTArray<Accessible*>* aItems) MOZ_OVERRIDE;
virtual uint32_t SelectedItemCount();
virtual Accessible* GetSelectedItem(uint32_t aIndex);
virtual bool IsItemSelected(uint32_t aIndex);
virtual bool AddItemToSelection(uint32_t aIndex);
virtual bool RemoveItemFromSelection(uint32_t aIndex);
virtual bool SelectAll();
virtual bool UnselectAll();
virtual uint32_t SelectedItemCount() MOZ_OVERRIDE;
virtual Accessible* GetSelectedItem(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool IsItemSelected(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool AddItemToSelection(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool RemoveItemFromSelection(uint32_t aIndex) MOZ_OVERRIDE;
virtual bool SelectAll() MOZ_OVERRIDE;
virtual bool UnselectAll() MOZ_OVERRIDE;
// Widgets
virtual bool IsWidget() const;
virtual bool IsActiveWidget() const;
virtual bool AreItemsOperable() const;
virtual Accessible* CurrentItem();
virtual void SetCurrentItem(Accessible* aItem);
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* CurrentItem() MOZ_OVERRIDE;
virtual void SetCurrentItem(Accessible* aItem) MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
// XULTreeAccessible
@ -162,7 +162,7 @@ public:
virtual bool DoAction(uint8_t aIndex) MOZ_OVERRIDE;
// Widgets
virtual Accessible* ContainerWidget() const;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
// XULTreeItemAccessibleBase
NS_DECLARE_STATIC_IID_ACCESSOR(XULTREEITEMBASEACCESSIBLE_IMPL_CID)
@ -190,9 +190,9 @@ protected:
enum { eAction_Click = 0, eAction_Expand = 1 };
// Accessible
virtual void DispatchClickEvent(nsIContent *aContent, uint32_t aActionIndex);
virtual void DispatchClickEvent(nsIContent *aContent, uint32_t aActionIndex) MOZ_OVERRIDE;
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult *aError = nullptr) const;
nsresult *aError = nullptr) const MOZ_OVERRIDE;
// XULTreeItemAccessibleBase
@ -231,18 +231,18 @@ public:
XULTreeItemAccessibleBase)
// Accessible
virtual void Shutdown();
virtual ENameValueFlag Name(nsString& aName);
virtual void Shutdown() MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
// XULTreeItemAccessibleBase
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx);
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE;
protected:
virtual ~XULTreeItemAccessible();
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
// XULTreeItemAccessible
nsCOMPtr<nsITreeColumn> mColumn;

58
accessible/xul/XULTreeGridAccessible.h
View File

@ -30,26 +30,26 @@ public:
{ mGenericTypes |= eTable; }
// TableAccessible
virtual uint32_t ColCount();
virtual uint32_t RowCount();
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex);
virtual void ColDescription(uint32_t aColIdx, nsString& aDescription);
virtual bool IsColSelected(uint32_t aColIdx);
virtual bool IsRowSelected(uint32_t aRowIdx);
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx);
virtual uint32_t SelectedCellCount();
virtual uint32_t SelectedColCount();
virtual uint32_t SelectedRowCount();
virtual void SelectedCells(nsTArray<Accessible*>* aCells);
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells);
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols);
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows);
virtual void SelectRow(uint32_t aRowIdx);
virtual void UnselectRow(uint32_t aRowIdx);
virtual Accessible* AsAccessible() { return this; }
virtual uint32_t ColCount() MOZ_OVERRIDE;
virtual uint32_t RowCount() MOZ_OVERRIDE;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) MOZ_OVERRIDE;
virtual void ColDescription(uint32_t aColIdx, nsString& aDescription) MOZ_OVERRIDE;
virtual bool IsColSelected(uint32_t aColIdx) MOZ_OVERRIDE;
virtual bool IsRowSelected(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) MOZ_OVERRIDE;
virtual uint32_t SelectedCellCount() MOZ_OVERRIDE;
virtual uint32_t SelectedColCount() MOZ_OVERRIDE;
virtual uint32_t SelectedRowCount() MOZ_OVERRIDE;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) MOZ_OVERRIDE;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) MOZ_OVERRIDE;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) MOZ_OVERRIDE;
virtual void SelectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual void UnselectRow(uint32_t aRowIdx) MOZ_OVERRIDE;
virtual Accessible* AsAccessible() MOZ_OVERRIDE { return this; }
// Accessible
virtual TableAccessible* AsTable() { return this; }
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
virtual a11y::role NativeRole() MOZ_OVERRIDE;
protected:
@ -80,11 +80,11 @@ public:
XULTreeItemAccessibleBase)
// Accessible
virtual void Shutdown();
virtual void Shutdown() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName);
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild);
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t ChildCount() const MOZ_OVERRIDE;
@ -92,13 +92,13 @@ public:
// XULTreeItemAccessibleBase
virtual XULTreeGridCellAccessible* GetCellAccessible(nsITreeColumn* aColumn)
const MOZ_OVERRIDE MOZ_FINAL;
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx);
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE;
protected:
virtual ~XULTreeGridRowAccessible();
// Accessible
virtual void CacheChildren();
virtual void CacheChildren() MOZ_OVERRIDE;
// XULTreeItemAccessibleBase
mutable nsRefPtrHashtable<nsPtrHashKey<const void>, XULTreeGridCellAccessible>
@ -127,12 +127,12 @@ public:
LeafAccessible)
// Accessible
virtual TableCellAccessible* AsTableCell() { return this; }
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual nsIntRect Bounds() const MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName);
virtual Accessible* FocusedChild();
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual Accessible* FocusedChild() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual int32_t IndexInParent() const;
virtual int32_t IndexInParent() const MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
@ -163,8 +163,8 @@ protected:
// Accessible
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult* aError = nullptr) const;
virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex);
nsresult* aError = nullptr) const MOZ_OVERRIDE;
virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex) MOZ_OVERRIDE;
// XULTreeGridCellAccessible