Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj

Browse Source 
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
This commit is contained in:
Ehsan Akhgari 2015-03-21 12:28:04 -04:00
parent 10bf1e34ef
commit 883849ee32
2786 changed files with 21130 additions and 21130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/atk/AccessibleWrap.h
View File

@ -52,11 +52,11 @@ public:
virtual ~AccessibleWrap();
void ShutdownAtkObject();
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
// return the atk object for this AccessibleWrap
virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE;
virtual void GetNativeInterface(void** aOutAccessible) override;
virtual nsresult HandleAccEvent(AccEvent* aEvent) override;
AtkObject * GetAtkObject(void);
static AtkObject* GetAtkObject(Accessible* aAccessible);

8
accessible/atk/ApplicationAccessibleWrap.h
View File

@ -19,14 +19,14 @@ public:
virtual ~ApplicationAccessibleWrap();
// Accessible
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE;
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override;
virtual bool RemoveChild(Accessible* aChild) override;
/**
* Return the atk object for app root accessible.
*/
virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
virtual void GetNativeInterface(void** aOutAccessible) override;
};
} // namespace a11y

4
accessible/atk/AtkSocketAccessible.h
View File

@ -45,9 +45,9 @@ public:
AtkSocketAccessible(nsIContent* aContent, DocAccessible* aDoc,
const nsCString& aPlugId);
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
virtual void GetNativeInterface(void** aOutAccessible) override;
};
} // namespace a11y

2
accessible/atk/RootAccessibleWrap.h
View File

@ -20,7 +20,7 @@ typedef RootAccessible RootAccessibleWrap;
* It is added into root when the toplevel window is created, and removed
* from root when the toplevel window is destroyed.
*/
class GtkWindowAccessible MOZ_FINAL : public DummyAccessible
class GtkWindowAccessible final : public DummyAccessible
{
public:
explicit GtkWindowAccessible(AtkObject* aAccessible);

6
accessible/base/AccCollector.h
View File

@ -71,20 +71,20 @@ private:
* Collect embedded objects. Provide quick access to accessible by index and
* vice versa.
*/
class EmbeddedObjCollector MOZ_FINAL : public AccCollector
class EmbeddedObjCollector final : public AccCollector
{
public:
virtual ~EmbeddedObjCollector() { }
public:
virtual int32_t GetIndexAt(Accessible* aAccessible) MOZ_OVERRIDE;
virtual int32_t GetIndexAt(Accessible* aAccessible) override;
protected:
// Make sure it's used by Accessible class only.
explicit EmbeddedObjCollector(Accessible* aRoot) :
AccCollector(aRoot, filters::GetEmbeddedObject) { }
virtual void AppendObject(Accessible* aAccessible) MOZ_OVERRIDE;
virtual void AppendObject(Accessible* aAccessible) override;
friend class Accessible;
};

24
accessible/base/AccEvent.h
View File

@ -154,7 +154,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eStateChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eStateChangeEvent);
}
@ -183,7 +183,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eTextChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eTextChangeEvent);
}
@ -223,7 +223,7 @@ public:
// Event
static const EventGroup kEventGroup = eMutationEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eMutationEvent);
}
@ -253,7 +253,7 @@ public:
// Event
static const EventGroup kEventGroup = eHideEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccMutationEvent::GetEventGroups() | (1U << eHideEvent);
}
@ -281,7 +281,7 @@ public:
// Event
static const EventGroup kEventGroup = eShowEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccMutationEvent::GetEventGroups() | (1U << eShowEvent);
}
@ -301,7 +301,7 @@ public:
// Event
static const EventGroup kEventGroup = eReorderEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eReorderEvent);
}
@ -354,7 +354,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eCaretMoveEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eCaretMoveEvent);
}
@ -380,7 +380,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eTextSelChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eTextSelChangeEvent);
}
@ -419,7 +419,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eSelectionChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eSelectionChangeEvent);
}
@ -449,7 +449,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eTableChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eTableChangeEvent);
}
@ -479,7 +479,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eVirtualCursorChangeEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eVirtualCursorChangeEvent);
}
@ -509,7 +509,7 @@ public:
// AccEvent
static const EventGroup kEventGroup = eObjectAttrChangedEvent;
virtual unsigned int GetEventGroups() const MOZ_OVERRIDE
virtual unsigned int GetEventGroups() const override
{
return AccEvent::GetEventGroups() | (1U << eObjectAttrChangedEvent);
}

28
accessible/base/AccIterator.h
View File

@ -43,7 +43,7 @@ public:
* Return next accessible complying with filter function. Return the first
* accessible for the first time.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
AccIterator();
@ -89,7 +89,7 @@ public:
/**
* Return next related accessible for the given dependent accessible.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
RelatedAccIterator();
@ -123,7 +123,7 @@ public:
/**
* Return next label accessible associated with the given element.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
HTMLLabelIterator();
@ -150,7 +150,7 @@ public:
/**
* Return next output accessible associated with the given element.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
HTMLOutputIterator();
@ -173,7 +173,7 @@ public:
/**
* Return next label accessible associated with the given element.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
XULLabelIterator();
@ -196,7 +196,7 @@ public:
/**
* Return next description accessible associated with the given element.
*/
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
XULDescriptionIterator();
@ -234,7 +234,7 @@ public:
nsIContent* GetElem(const nsDependentSubstring& aID);
// AccIterable
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
IDRefsIterator();
@ -251,13 +251,13 @@ private:
/**
* Iterates over related accessible referred by aria-owns.
*/
class ARIAOwnedByIterator MOZ_FINAL : public RelatedAccIterator
class ARIAOwnedByIterator final : public RelatedAccIterator
{
public:
explicit ARIAOwnedByIterator(const Accessible* aDependent);
virtual ~ARIAOwnedByIterator() { }
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
ARIAOwnedByIterator() = delete;
@ -271,13 +271,13 @@ private:
/**
* Iterates over related accessible referred by aria-owns.
*/
class ARIAOwnsIterator MOZ_FINAL : public AccIterable
class ARIAOwnsIterator final : public AccIterable
{
public:
explicit ARIAOwnsIterator(const Accessible* aOwner);
virtual ~ARIAOwnsIterator() { }
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
ARIAOwnsIterator() = delete;
@ -299,7 +299,7 @@ public:
explicit SingleAccIterator(Accessible* aTarget): mAcc(aTarget) { }
virtual ~SingleAccIterator() { }
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
SingleAccIterator();
@ -320,7 +320,7 @@ public:
mContainer(aItemContainer), mAnchor(nullptr) { }
virtual ~ItemIterator() { }
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
ItemIterator() = delete;
@ -342,7 +342,7 @@ public:
int32_t aRowIdx);
virtual ~XULTreeItemIterator() { }
virtual Accessible* Next() MOZ_OVERRIDE;
virtual Accessible* Next() override;
private:
XULTreeItemIterator() = delete;

10
accessible/base/NotificationController.h
View File

@ -64,7 +64,7 @@ public:
mInstance(aInstance), mCallback(aCallback), mArg(aArg) { }
virtual ~TNotification() { mInstance = nullptr; }
virtual void Process() MOZ_OVERRIDE
virtual void Process() override
{
(mInstance->*mCallback)(mArg);
@ -85,14 +85,14 @@ private:
/**
* Used to process notifications from core for the document accessible.
*/
class NotificationController MOZ_FINAL : public EventQueue,
class NotificationController final : public EventQueue,
public nsARefreshObserver
{
public:
NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
NS_IMETHOD_(MozExternalRefCountType) AddRef(void) MOZ_OVERRIDE;
NS_IMETHOD_(MozExternalRefCountType) Release(void) MOZ_OVERRIDE;
NS_IMETHOD_(MozExternalRefCountType) AddRef(void) override;
NS_IMETHOD_(MozExternalRefCountType) Release(void) override;
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(NotificationController)
@ -203,7 +203,7 @@ private:
NotificationController& operator = (const NotificationController&);
// nsARefreshObserver
virtual void WillRefresh(mozilla::TimeStamp aTime) MOZ_OVERRIDE;
virtual void WillRefresh(mozilla::TimeStamp aTime) override;
private:
/**

2
accessible/base/SelectionManager.cpp
View File

@ -24,7 +24,7 @@ using namespace mozilla;
using namespace mozilla::a11y;
using mozilla::dom::Selection;
struct mozilla::a11y::SelData MOZ_FINAL
struct mozilla::a11y::SelData final
{
SelData(Selection* aSel, int32_t aReason) :
mSel(aSel), mReason(aReason) {}

48
accessible/base/TextAttrs.h
View File

@ -130,7 +130,7 @@ protected:
// TextAttr
virtual void Expose(nsIPersistentProperties* aAttributes,
bool aIncludeDefAttrValue) MOZ_OVERRIDE
bool aIncludeDefAttrValue) override
{
if (mGetRootValue) {
if (mIsRootDefined)
@ -148,7 +148,7 @@ protected:
ExposeValue(aAttributes, mRootNativeValue);
}
virtual bool Equal(Accessible* aAccessible) MOZ_OVERRIDE
virtual bool Equal(Accessible* aAccessible) override
{
T nativeValue;
bool isDefined = GetValueFor(aAccessible, &nativeValue);
@ -203,9 +203,9 @@ protected:
protected:
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue) MOZ_OVERRIDE;
virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue) override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nsString& aValue) MOZ_OVERRIDE;
const nsString& aValue) override;
private:
nsCOMPtr<nsIContent> mRootContent;
@ -234,9 +234,9 @@ protected:
};
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, uint32_t* aValue) MOZ_OVERRIDE;
virtual bool GetValueFor(Accessible* aAccessible, uint32_t* aValue) override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const uint32_t& aValue) MOZ_OVERRIDE;
const uint32_t& aValue) override;
private:
bool GetValue(nsIContent* aElm, uint32_t* aValue);
@ -257,9 +257,9 @@ protected:
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, nscolor* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nscolor& aValue) MOZ_OVERRIDE;
const nscolor& aValue) override;
private:
bool GetColor(nsIFrame* aFrame, nscolor* aColor);
@ -280,9 +280,9 @@ protected:
// TTextAttr
virtual bool GetValueFor(Accessible* aAccessible, nscolor* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nscolor& aValue) MOZ_OVERRIDE;
const nscolor& aValue) override;
};
@ -299,9 +299,9 @@ protected:
// TTextAttr
virtual bool GetValueFor(Accessible* aAccessible, nsString* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nsString& aValue) MOZ_OVERRIDE;
const nsString& aValue) override;
private:
@ -322,9 +322,9 @@ protected:
// TTextAttr
virtual bool GetValueFor(Accessible* aAccessible, nscoord* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nscoord& aValue) MOZ_OVERRIDE;
const nscoord& aValue) override;
private:
nsDeviceContext* mDC;
@ -344,9 +344,9 @@ protected:
// TTextAttr
virtual bool GetValueFor(Accessible* aContent, nscoord* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const nscoord& aValue) MOZ_OVERRIDE;
const nscoord& aValue) override;
};
@ -363,9 +363,9 @@ protected:
// TTextAttr
virtual bool GetValueFor(Accessible* aAccessible, int32_t* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const int32_t& aValue) MOZ_OVERRIDE;
const int32_t& aValue) override;
private:
int32_t GetFontWeight(nsIFrame* aFrame);
@ -384,9 +384,9 @@ protected:
protected:
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, bool* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const bool& aValue) MOZ_OVERRIDE;
const bool& aValue) override;
};
@ -436,9 +436,9 @@ protected:
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, TextDecorValue* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const TextDecorValue& aValue) MOZ_OVERRIDE;
const TextDecorValue& aValue) override;
};
/**
@ -462,9 +462,9 @@ protected:
// TextAttr
virtual bool GetValueFor(Accessible* aAccessible, TextPosValue* aValue)
MOZ_OVERRIDE;
override;
virtual void ExposeValue(nsIPersistentProperties* aAttributes,
const TextPosValue& aValue) MOZ_OVERRIDE;
const TextPosValue& aValue) override;
private:
TextPosValue GetTextPosValue(nsIFrame* aFrame) const;

4
accessible/base/TextRange.h
View File

@ -24,7 +24,7 @@ class HyperTextAccessible;
/**
* A text point (hyper text + offset), represents a boundary of text range.
*/
struct TextPoint MOZ_FINAL
struct TextPoint final
{
TextPoint(HyperTextAccessible* aContainer, int32_t aOffset) :
mContainer(aContainer), mOffset(aOffset) { }
@ -42,7 +42,7 @@ struct TextPoint MOZ_FINAL
/**
* Represents a text range within the text control or document.
*/
class TextRange MOZ_FINAL
class TextRange final
{
public:
TextRange(HyperTextAccessible* aRoot,

2
accessible/base/TreeWalker.h
View File

@ -22,7 +22,7 @@ class DocAccessible;
/**
* This class is used to walk the DOM tree to create accessible tree.
*/
class TreeWalker MOZ_FINAL
class TreeWalker final
{
public:
enum {

4
accessible/base/nsAccessibilityService.cpp
View File

@ -345,7 +345,7 @@ nsAccessibilityService::GetRootDocumentAccessible(nsIPresShell* aPresShell,
static StaticAutoPtr<nsTArray<nsCOMPtr<nsIContent> > > sPendingPlugins;
static StaticAutoPtr<nsTArray<nsCOMPtr<nsITimer> > > sPluginTimers;
class PluginTimerCallBack MOZ_FINAL : public nsITimerCallback
class PluginTimerCallBack final : public nsITimerCallback
{
~PluginTimerCallBack() {}
@ -354,7 +354,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Notify(nsITimer* aTimer) MOZ_FINAL
NS_IMETHODIMP Notify(nsITimer* aTimer) final
{
if (!mContent->IsInDoc())
return NS_OK;

12
accessible/base/nsAccessibilityService.h
View File

@ -63,7 +63,7 @@ struct MarkupMapInfo {
} // namespace a11y
} // namespace mozilla
class nsAccessibilityService MOZ_FINAL : public mozilla::a11y::DocManager,
class nsAccessibilityService final : public mozilla::a11y::DocManager,
public mozilla::a11y::FocusManager,
public mozilla::a11y::SelectionManager,
public nsIAccessibilityService,
@ -83,7 +83,7 @@ public:
// nsIAccessibilityService
virtual Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
bool aCanCreate) MOZ_OVERRIDE;
bool aCanCreate) override;
already_AddRefed<Accessible>
CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent,
Accessible* aContext);
@ -92,10 +92,10 @@ public:
* Adds/remove ATK root accessible for gtk+ native window to/from children
* of the application accessible.
*/
virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) MOZ_OVERRIDE;
virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) MOZ_OVERRIDE;
virtual Accessible* AddNativeRootAccessible(void* aAtkAccessible) override;
virtual void RemoveNativeRootAccessible(Accessible* aRootAccessible) override;
virtual bool HasAccessible(nsIDOMNode* aDOMNode) MOZ_OVERRIDE;
virtual bool HasAccessible(nsIDOMNode* aDOMNode) override;
// nsAccesibilityService
/**
@ -164,7 +164,7 @@ public:
*/
void RecreateAccessible(nsIPresShell* aPresShell, nsIContent* aContent);
virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget) MOZ_OVERRIDE;
virtual void FireAccessibleEvent(uint32_t aEvent, Accessible* aTarget) override;
// nsAccessibiltiyService

2
accessible/base/nsAccessiblePivot.h
View File

@ -20,7 +20,7 @@ class RuleCache;
/**
* Class represents an accessible pivot.
*/
class nsAccessiblePivot MOZ_FINAL : public nsIAccessiblePivot
class nsAccessiblePivot final : public nsIAccessiblePivot
{
public:
typedef mozilla::a11y::Accessible Accessible;

52
accessible/generic/ARIAGridAccessible.h
View File

@ -25,27 +25,27 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
virtual TableAccessible* AsTable() override { return this; }
// TableAccessible
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; }
virtual uint32_t ColCount() override;
virtual uint32_t RowCount() override;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override;
virtual bool IsColSelected(uint32_t aColIdx) override;
virtual bool IsRowSelected(uint32_t aRowIdx) override;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual uint32_t SelectedCellCount() override;
virtual uint32_t SelectedColCount() override;
virtual uint32_t SelectedRowCount() override;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) override;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) override;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) override;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) override;
virtual void SelectCol(uint32_t aColIdx) override;
virtual void SelectRow(uint32_t aRowIdx) override;
virtual void UnselectCol(uint32_t aColIdx) override;
virtual void UnselectRow(uint32_t aRowIdx) override;
virtual Accessible* AsAccessible() override { return this; }
protected:
virtual ~ARIAGridAccessible() {}
@ -85,9 +85,9 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual TableCellAccessible* AsTableCell() override { return this; }
virtual void ApplyARIAState(uint64_t* aState) const override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
protected:
virtual ~ARIAGridCellAccessible() {}
@ -112,10 +112,10 @@ protected:
int32_t RowIndexFor(Accessible* aRow) const;
// TableCellAccessible
virtual TableAccessible* Table() const MOZ_OVERRIDE;
virtual uint32_t ColIdx() const MOZ_OVERRIDE;
virtual uint32_t RowIdx() const MOZ_OVERRIDE;
virtual bool Selected() MOZ_OVERRIDE;
virtual TableAccessible* Table() const override;
virtual uint32_t ColIdx() const override;
virtual uint32_t RowIdx() const override;
virtual bool Selected() override;
};
} // namespace a11y

4
accessible/generic/Accessible.cpp
View File

@ -1723,13 +1723,13 @@ Accessible::GetNativeInterface(void** aNativeAccessible)
void
Accessible::DoCommand(nsIContent *aContent, uint32_t aActionIndex)
{
class Runnable MOZ_FINAL : public nsRunnable
class Runnable final : public nsRunnable
{
public:
Runnable(Accessible* aAcc, nsIContent* aContent, uint32_t aIdx) :
mAcc(aAcc), mContent(aContent), mIdx(aIdx) { }
NS_IMETHOD Run() MOZ_OVERRIDE
NS_IMETHOD Run() override
{
if (mAcc)
mAcc->DispatchClickEvent(mContent, mIdx);

36
accessible/generic/ApplicationAccessible.h
View File

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

44
accessible/generic/BaseAccessibles.h
View File

@ -34,15 +34,15 @@ public:
// Accessible
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
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;
EWhichChildAtPoint aWhichChild) override;
virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override final;
virtual bool RemoveChild(Accessible* aChild) override final;
protected:
virtual ~LeafAccessible() {}
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
};
/**
@ -61,26 +61,26 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual uint64_t NativeLinkState() const MOZ_OVERRIDE;
virtual void TakeFocus() MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual void Value(nsString& aValue) override;
virtual uint64_t NativeLinkState() const override;
virtual void TakeFocus() override;
// ActionAccessible
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 MOZ_OVERRIDE;
virtual uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t index) override;
virtual KeyBinding AccessKey() const override;
// HyperLinkAccessible
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) override;
protected:
virtual ~LinkableAccessible() {}
// Accessible
virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent) MOZ_OVERRIDE;
virtual void UnbindFromParent() MOZ_OVERRIDE;
virtual void BindToParent(Accessible* aParent, uint32_t aIndexInParent) override;
virtual void UnbindFromParent() override;
/**
* Parent accessible that provides an action for this linkable accessible.
@ -100,11 +100,11 @@ public:
EnumRoleAccessible(nsIContent* aContent, DocAccessible* aDoc) :
AccessibleWrap(aContent, aDoc) { }
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) MOZ_OVERRIDE
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) override
{ return Accessible::QueryInterface(aIID, aPtr); }
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE { return R; }
virtual a11y::role NativeRole() override { return R; }
protected:
virtual ~EnumRoleAccessible() { }
@ -121,11 +121,11 @@ public:
explicit DummyAccessible(DocAccessible* aDocument = nullptr) :
AccessibleWrap(nullptr, aDocument) { }
virtual uint64_t NativeState() MOZ_OVERRIDE MOZ_FINAL;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE MOZ_FINAL;
virtual uint64_t NativeLinkState() const MOZ_OVERRIDE MOZ_FINAL;
virtual bool NativelyUnavailable() const MOZ_OVERRIDE MOZ_FINAL;
virtual void ApplyARIAState(uint64_t* aState) const MOZ_OVERRIDE MOZ_FINAL;
virtual uint64_t NativeState() override final;
virtual uint64_t NativeInteractiveState() const override final;
virtual uint64_t NativeLinkState() const override final;
virtual bool NativelyUnavailable() const override final;
virtual void ApplyARIAState(uint64_t* aState) const override final;
protected:
virtual ~DummyAccessible() { }

38
accessible/generic/DocAccessible.h
View File

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

28
accessible/generic/FormControlAccessible.h
View File

@ -28,19 +28,19 @@ public:
}
// Accessible
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
// Value
virtual double MaxValue() const MOZ_OVERRIDE;
virtual double MinValue() const MOZ_OVERRIDE;
virtual double CurValue() const MOZ_OVERRIDE;
virtual double Step() const MOZ_OVERRIDE;
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
virtual double MaxValue() const override;
virtual double MinValue() const override;
virtual double CurValue() const override;
virtual double Step() const override;
virtual bool SetCurValue(double aValue) override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
protected:
virtual ~ProgressMeterAccessible() {}
@ -56,17 +56,17 @@ public:
RadioButtonAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
enum { eAction_Click = 0 };
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
};
} // namespace a11y

18
accessible/generic/HyperTextAccessible.h
View File

@ -54,14 +54,14 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual nsIAtom* LandmarkRole() const MOZ_OVERRIDE;
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 nsIAtom* LandmarkRole() const override;
virtual int32_t GetLevelInternal() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
virtual void InvalidateChildren() override;
virtual bool RemoveChild(Accessible* aAccessible) override;
// HyperTextAccessible (static helper method)
@ -432,8 +432,8 @@ protected:
virtual ~HyperTextAccessible() { }
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren() MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
virtual void CacheChildren() override;
// HyperTextAccessible

14
accessible/generic/ImageAccessible.h
View File

@ -24,14 +24,14 @@ public:
ImageAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// ImageAccessible
nsIntPoint Position(uint32_t aCoordType);
@ -41,7 +41,7 @@ protected:
virtual ~ImageAccessible();
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
private:
/**

18
accessible/generic/OuterDocAccessible.h
View File

@ -20,7 +20,7 @@ namespace a11y {
* the inner document root.
*/
class OuterDocAccessible MOZ_FINAL : public AccessibleWrap
class OuterDocAccessible final : public AccessibleWrap
{
public:
OuterDocAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -28,20 +28,20 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual mozilla::a11y::role NativeRole() override;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
EWhichChildAtPoint aWhichChild) override;
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
virtual void InvalidateChildren() override;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override;
virtual bool RemoveChild(Accessible* aAccessible) override;
protected:
virtual ~OuterDocAccessible() MOZ_OVERRIDE;
virtual ~OuterDocAccessible() override;
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
};
} // namespace a11y

16
accessible/generic/RootAccessible.h
View File

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

8
accessible/generic/TextLeafAccessible.h
View File

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

2
accessible/html/HTMLCanvasAccessible.h
View File

@ -23,7 +23,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
protected:
virtual ~HTMLCanvasAccessible() { }

14
accessible/html/HTMLElementAccessibles.h
View File

@ -23,7 +23,7 @@ public:
LeafAccessible(aContent, aDoc) {}
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
};
/**
@ -39,12 +39,12 @@ public:
}
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -60,11 +60,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) override;
protected:
virtual ~HTMLLabelAccessible() {}
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -80,7 +80,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) override;
protected:
virtual ~HTMLOutputAccessible() {}

106
accessible/html/HTMLFormControlAccessible.h
View File

@ -35,16 +35,16 @@ public:
}
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
};
@ -64,9 +64,9 @@ public:
}
// Accessible
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeState() override;
virtual void GetPositionAndSizeInternal(int32_t *aPosInSet,
int32_t *aSetSize) MOZ_OVERRIDE;
int32_t *aSetSize) override;
};
@ -83,21 +83,21 @@ public:
HTMLButtonAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t State() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t State() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
@ -105,7 +105,7 @@ protected:
* Accessible for HTML input@type="text", input@type="password", textarea and
* other HTML text controls.
*/
class HTMLTextFieldAccessible MOZ_FINAL : public HyperTextAccessibleWrap
class HTMLTextFieldAccessible final : public HyperTextAccessibleWrap
{
public:
@ -116,29 +116,29 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// HyperTextAccessible
virtual already_AddRefed<nsIEditor> GetEditor() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIEditor> GetEditor() const override;
// Accessible
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;
virtual void Value(nsString& aValue) override;
virtual void ApplyARIAState(uint64_t* aState) const override;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
virtual Accessible* ContainerWidget() const override;
protected:
virtual ~HTMLTextFieldAccessible() {}
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
/**
* Return a XUL widget element this input is part of.
@ -156,8 +156,8 @@ public:
HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual nsresult HandleAccEvent(AccEvent* aAccEvent) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual nsresult HandleAccEvent(AccEvent* aAccEvent) override;
};
@ -174,14 +174,14 @@ public:
}
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual void Value(nsString& aValue) override;
virtual double MaxValue() const MOZ_OVERRIDE;
virtual double MinValue() const MOZ_OVERRIDE;
virtual double CurValue() const MOZ_OVERRIDE;
virtual double Step() const MOZ_OVERRIDE;
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
virtual double MaxValue() const override;
virtual double MinValue() const override;
virtual double CurValue() const override;
virtual double Step() const override;
virtual bool SetCurValue(double aValue) override;
};
@ -198,18 +198,18 @@ public:
}
// Accessible
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual mozilla::a11y::role NativeRole() override;
// Value
virtual double MaxValue() const MOZ_OVERRIDE;
virtual double MinValue() const MOZ_OVERRIDE;
virtual double CurValue() const MOZ_OVERRIDE;
virtual double Step() const MOZ_OVERRIDE;
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
virtual double MaxValue() const override;
virtual double MinValue() const override;
virtual double CurValue() const override;
virtual double Step() const override;
virtual bool SetCurValue(double aValue) override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
};
@ -222,12 +222,12 @@ public:
HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual Relation RelationByType(RelationType aType) override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
// HTMLGroupboxAccessible
nsIContent* GetLegend() const;
@ -243,7 +243,7 @@ public:
HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) override;
};
/**
@ -255,11 +255,11 @@ public:
HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
// HTMLLegendAccessible
nsIContent* Caption() const;
@ -275,7 +275,7 @@ public:
HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) override;
};
} // namespace a11y

28
accessible/html/HTMLImageMapAccessible.h
View File

@ -16,7 +16,7 @@ namespace a11y {
/**
* Used for HTML image maps.
*/
class HTMLImageMapAccessible MOZ_FINAL : public ImageAccessibleWrap
class HTMLImageMapAccessible final : public ImageAccessibleWrap
{
public:
HTMLImageMapAccessible(nsIContent* aContent, DocAccessible* aDoc);
@ -25,12 +25,12 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
// HyperLinkAccessible
virtual uint32_t AnchorCount() MOZ_OVERRIDE;
virtual Accessible* AnchorAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
virtual uint32_t AnchorCount() override;
virtual Accessible* AnchorAt(uint32_t aAnchorIndex) override;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) override;
/**
* Update area children of the image map.
@ -46,32 +46,32 @@ protected:
virtual ~HTMLImageMapAccessible() { }
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
};
/**
* Accessible for image map areas - must be child of image.
*/
class HTMLAreaAccessible MOZ_FINAL : public HTMLLinkAccessible
class HTMLAreaAccessible final : public HTMLLinkAccessible
{
public:
HTMLAreaAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Description(nsString& aDescription) MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) override;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE;
EWhichChildAtPoint aWhichChild) override;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override;
// HyperLinkAccessible
virtual uint32_t StartOffset() MOZ_OVERRIDE;
virtual uint32_t EndOffset() MOZ_OVERRIDE;
virtual uint32_t StartOffset() override;
virtual uint32_t EndOffset() override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren() MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
virtual void CacheChildren() override;
};

20
accessible/html/HTMLLinkAccessible.h
View File

@ -19,20 +19,20 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
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;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeLinkState() const override;
virtual uint64_t NativeInteractiveState() const 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// HyperLinkAccessible
virtual bool IsLink() MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) MOZ_OVERRIDE;
virtual bool IsLink() override;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) override;
protected:
virtual ~HTMLLinkAccessible() {}

24
accessible/html/HTMLListAccessible.h
View File

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

98
accessible/html/HTMLSelectAccessible.h
View File

@ -39,24 +39,24 @@ public:
virtual ~HTMLSelectListAccessible() {}
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
// SelectAccessible
virtual bool SelectAll() MOZ_OVERRIDE;
virtual bool UnselectAll() MOZ_OVERRIDE;
virtual bool SelectAll() override;
virtual bool UnselectAll() override;
// Widgets
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 bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* CurrentItem() override;
virtual void SetCurrentItem(Accessible* aItem) override;
protected:
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
};
/*
@ -71,25 +71,25 @@ public:
virtual ~HTMLSelectOptionAccessible() {}
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual int32_t GetLevelInternal() MOZ_OVERRIDE;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const MOZ_OVERRIDE;
virtual void SetSelected(bool aSelect) MOZ_OVERRIDE;
virtual int32_t GetLevelInternal() override;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override;
virtual void SetSelected(bool aSelect) 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
private:
@ -141,13 +141,13 @@ public:
virtual ~HTMLSelectOptGroupAccessible() {}
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeInteractiveState() const 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
};
/** ------------------------------------------------------ */
@ -159,7 +159,7 @@ class HTMLComboboxListAccessible;
/*
* A class the represents the HTML Combobox widget.
*/
class HTMLComboboxAccessible MOZ_FINAL : public AccessibleWrap
class HTMLComboboxAccessible final : public AccessibleWrap
{
public:
enum { eAction_Click = 0 };
@ -168,29 +168,29 @@ public:
virtual ~HTMLComboboxAccessible() {}
// Accessible
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() MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual void Description(nsString& aDescription) override;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual void InvalidateChildren() override;
virtual bool RemoveChild(Accessible* aChild) 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
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 bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* CurrentItem() override;
virtual void SetCurrentItem(Accessible* aItem) override;
protected:
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
/**
* Return selected option.
@ -215,14 +215,14 @@ public:
virtual ~HTMLComboboxListAccessible() {}
// Accessible
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;
virtual nsIFrame* GetFrame() const override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual nsRect RelativeBounds(nsIFrame** aBoundingFrame) const override;
// Widgets
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
};
} // namespace a11y

104
accessible/html/HTMLTableAccessible.h
View File

@ -29,21 +29,21 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
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;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual TableCellAccessible* AsTableCell() override { return this; }
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
// TableCellAccessible
virtual TableAccessible* Table() const MOZ_OVERRIDE;
virtual uint32_t ColIdx() const MOZ_OVERRIDE;
virtual uint32_t RowIdx() const MOZ_OVERRIDE;
virtual uint32_t ColExtent() const MOZ_OVERRIDE;
virtual uint32_t RowExtent() const MOZ_OVERRIDE;
virtual void ColHeaderCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual void RowHeaderCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE;
virtual bool Selected() MOZ_OVERRIDE;
virtual TableAccessible* Table() const override;
virtual uint32_t ColIdx() const override;
virtual uint32_t RowIdx() const override;
virtual uint32_t ColExtent() const override;
virtual uint32_t RowExtent() const override;
virtual void ColHeaderCells(nsTArray<Accessible*>* aCells) override;
virtual void RowHeaderCells(nsTArray<Accessible*>* aCells) override;
virtual bool Selected() override;
protected:
virtual ~HTMLTableCellAccessible() {}
@ -69,7 +69,7 @@ public:
HTMLTableHeaderCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
};
@ -89,7 +89,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
protected:
virtual ~HTMLTableRowAccessible() { }
@ -119,49 +119,49 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// TableAccessible
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 Accessible* Caption() const override;
virtual void Summary(nsString& aSummary) override;
virtual uint32_t ColCount() override;
virtual uint32_t RowCount() override;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override;
virtual int32_t CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual int32_t ColIndexAt(uint32_t aCellIdx) override;
virtual int32_t RowIndexAt(uint32_t aCellIdx) override;
virtual void RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx,
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; }
int32_t* aColIdx) override;
virtual uint32_t ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual uint32_t RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual bool IsColSelected(uint32_t aColIdx) override;
virtual bool IsRowSelected(uint32_t aRowIdx) override;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual uint32_t SelectedCellCount() override;
virtual uint32_t SelectedColCount() override;
virtual uint32_t SelectedRowCount() override;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) override;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) override;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) override;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) override;
virtual void SelectCol(uint32_t aColIdx) override;
virtual void SelectRow(uint32_t aRowIdx) override;
virtual void UnselectCol(uint32_t aColIdx) override;
virtual void UnselectRow(uint32_t aRowIdx) override;
virtual bool IsProbablyLayoutTable() override;
virtual Accessible* AsAccessible() override { return this; }
// Accessible
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;
virtual Relation RelationByType(RelationType aRelationType) MOZ_OVERRIDE;
virtual TableAccessible* AsTable() override { return this; }
virtual void Description(nsString& aDescription) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual Relation RelationByType(RelationType aRelationType) override;
protected:
virtual ~HTMLTableAccessible() {}
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren() MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
virtual void CacheChildren() override;
// HTMLTableAccessible
@ -211,8 +211,8 @@ public:
HyperTextAccessibleWrap(aContent, aDoc) { }
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aRelationType) MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual Relation RelationByType(RelationType aRelationType) override;
protected:
virtual ~HTMLCaptionAccessible() { }

66
accessible/ipc/DocAccessibleChild.h
View File

@ -42,62 +42,62 @@ public:
/*
* Return the state for the accessible with given ID.
*/
virtual bool RecvState(const uint64_t& aID, uint64_t* aState) MOZ_OVERRIDE;
virtual bool RecvState(const uint64_t& aID, uint64_t* aState) override;
/*
* Get the name for the accessible with given id.
*/
virtual bool RecvName(const uint64_t& aID, nsString* aName) MOZ_OVERRIDE;
virtual bool RecvName(const uint64_t& aID, nsString* aName) override;
virtual bool RecvValue(const uint64_t& aID, nsString* aValue) MOZ_OVERRIDE;
virtual bool RecvValue(const uint64_t& aID, nsString* aValue) override;
/*
* Get the description for the accessible with given id.
*/
virtual bool RecvDescription(const uint64_t& aID, nsString* aDesc) MOZ_OVERRIDE;
virtual bool RecvDescription(const uint64_t& aID, nsString* aDesc) override;
virtual bool RecvRelationByType(const uint64_t& aID, const uint32_t& aType,
nsTArray<uint64_t>* aTargets) MOZ_OVERRIDE;
nsTArray<uint64_t>* aTargets) override;
virtual bool RecvRelations(const uint64_t& aID,
nsTArray<RelationTargets>* aRelations)
MOZ_OVERRIDE;
override;
virtual bool RecvAttributes(const uint64_t& aID,
nsTArray<Attribute> *aAttributes) MOZ_OVERRIDE;
nsTArray<Attribute> *aAttributes) override;
virtual bool RecvCaretOffset(const uint64_t& aID, int32_t* aOffset)
MOZ_OVERRIDE;
override;
virtual bool RecvSetCaretOffset(const uint64_t& aID, const int32_t& aOffset,
bool* aValid) MOZ_OVERRIDE;
bool* aValid) override;
virtual bool RecvCharacterCount(const uint64_t& aID, int32_t* aCount)
MOZ_OVERRIDE;
override;
virtual bool RecvSelectionCount(const uint64_t& aID, int32_t* aCount)
MOZ_OVERRIDE;
override;
virtual bool RecvTextSubstring(const uint64_t& aID,
const int32_t& aStartOffset,
const int32_t& aEndOffset, nsString* aText)
MOZ_OVERRIDE;
override;
virtual bool RecvGetTextAfterOffset(const uint64_t& aID,
const int32_t& aOffset,
const int32_t& aBoundaryType,
nsString* aText, int32_t* aStartOffset,
int32_t* aEndOffset) MOZ_OVERRIDE;
int32_t* aEndOffset) override;
virtual bool RecvGetTextAtOffset(const uint64_t& aID,
const int32_t& aOffset,
const int32_t& aBoundaryType,
nsString* aText, int32_t* aStartOffset,
int32_t* aEndOffset) MOZ_OVERRIDE;
int32_t* aEndOffset) override;
virtual bool RecvGetTextBeforeOffset(const uint64_t& aID,
const int32_t& aOffset,
const int32_t& aBoundaryType,
nsString* aText, int32_t* aStartOffset,
int32_t* aEndOffset) MOZ_OVERRIDE;
int32_t* aEndOffset) override;
virtual bool RecvCharAt(const uint64_t& aID,
const int32_t& aOffset,
uint16_t* aChar) MOZ_OVERRIDE;
uint16_t* aChar) override;
virtual bool RecvTextAttributes(const uint64_t& aID,
const bool& aIncludeDefAttrs,
@ -105,84 +105,84 @@ public:
nsTArray<Attribute>* aAttributes,
int32_t* aStartOffset,
int32_t* aEndOffset)
MOZ_OVERRIDE;
override;
virtual bool RecvDefaultTextAttributes(const uint64_t& aID,
nsTArray<Attribute>* aAttributes)
MOZ_OVERRIDE;
override;
virtual bool RecvTextBounds(const uint64_t& aID,
const int32_t& aStartOffset,
const int32_t& aEndOffset,
const uint32_t& aCoordType,
nsIntRect* aRetVal) MOZ_OVERRIDE;
nsIntRect* aRetVal) override;
virtual bool RecvCharBounds(const uint64_t& aID,
const int32_t& aOffset,
const uint32_t& aCoordType,
nsIntRect* aRetVal) MOZ_OVERRIDE;
nsIntRect* aRetVal) override;
virtual bool RecvOffsetAtPoint(const uint64_t& aID,
const int32_t& aX,
const int32_t& aY,
const uint32_t& aCoordType,
int32_t* aRetVal) MOZ_OVERRIDE;
int32_t* aRetVal) override;
virtual bool RecvSelectionBoundsAt(const uint64_t& aID,
const int32_t& aSelectionNum,
bool* aSucceeded,
nsString* aData,
int32_t* aStartOffset,
int32_t* aEndOffset) MOZ_OVERRIDE;
int32_t* aEndOffset) override;
virtual bool RecvSetSelectionBoundsAt(const uint64_t& aID,
const int32_t& aSelectionNum,
const int32_t& aStartOffset,
const int32_t& aEndOffset,
bool* aSucceeded) MOZ_OVERRIDE;
bool* aSucceeded) override;
virtual bool RecvAddToSelection(const uint64_t& aID,
const int32_t& aStartOffset,
const int32_t& aEndOffset,
bool* aSucceeded) MOZ_OVERRIDE;
bool* aSucceeded) override;
virtual bool RecvRemoveFromSelection(const uint64_t& aID,
const int32_t& aSelectionNum,
bool* aSucceeded) MOZ_OVERRIDE;
bool* aSucceeded) override;
virtual bool RecvScrollSubstringTo(const uint64_t& aID,
const int32_t& aStartOffset,
const int32_t& aEndOffset,
const uint32_t& aScrollType) MOZ_OVERRIDE;
const uint32_t& aScrollType) override;
virtual bool RecvScrollSubstringToPoint(const uint64_t& aID,
const int32_t& aStartOffset,
const int32_t& aEndOffset,
const uint32_t& aCoordinateType,
const int32_t& aX,
const int32_t& aY) MOZ_OVERRIDE;
const int32_t& aY) override;
virtual bool RecvReplaceText(const uint64_t& aID,
const nsString& aText) MOZ_OVERRIDE;
const nsString& aText) override;
virtual bool RecvInsertText(const uint64_t& aID,
const nsString& aText,
const int32_t& aPosition) MOZ_OVERRIDE;
const int32_t& aPosition) override;
virtual bool RecvCopyText(const uint64_t& aID,
const int32_t& aStartPos,
const int32_t& aEndPos) MOZ_OVERRIDE;
const int32_t& aEndPos) override;
virtual bool RecvCutText(const uint64_t& aID,
const int32_t& aStartPos,
const int32_t& aEndPos) MOZ_OVERRIDE;
const int32_t& aEndPos) override;
virtual bool RecvDeleteText(const uint64_t& aID,
const int32_t& aStartPos,
const int32_t& aEndPos) MOZ_OVERRIDE;
const int32_t& aEndPos) override;
virtual bool RecvPasteText(const uint64_t& aID,
const int32_t& aPosition) MOZ_OVERRIDE;
const int32_t& aPosition) override;
private:
bool PersistentPropertiesToArray(nsIPersistentProperties* aProps,

8
accessible/ipc/DocAccessibleParent.h
View File

@ -40,13 +40,13 @@ public:
* process it is firing an event.
*/
virtual bool RecvEvent(const uint64_t& aID, const uint32_t& aType)
MOZ_OVERRIDE;
override;
virtual bool RecvShowEvent(const ShowEventData& aData) MOZ_OVERRIDE;
virtual bool RecvHideEvent(const uint64_t& aRootID) MOZ_OVERRIDE;
virtual bool RecvShowEvent(const ShowEventData& aData) override;
virtual bool RecvHideEvent(const uint64_t& aRootID) override;
void Destroy();
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason aWhy) override
{
if (!mShutdown)
Destroy();

12
accessible/mac/AccessibleWrap.h
View File

@ -36,7 +36,7 @@ public: // construction, destruction
/**
* Get the native Obj-C object (mozAccessible).
*/
virtual void GetNativeInterface(void** aOutAccessible) MOZ_OVERRIDE;
virtual void GetNativeInterface(void** aOutAccessible) override;
/**
* The objective-c |Class| type that this accessible's native object
@ -45,13 +45,13 @@ public: // construction, destruction
*/
virtual Class GetNativeType ();
virtual void Shutdown () MOZ_OVERRIDE;
virtual void InvalidateChildren() MOZ_OVERRIDE;
virtual void Shutdown () override;
virtual void InvalidateChildren() override;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) MOZ_OVERRIDE;
virtual bool RemoveChild(Accessible* aAccessible) MOZ_OVERRIDE;
virtual bool InsertChildAt(uint32_t aIdx, Accessible* aChild) override;
virtual bool RemoveChild(Accessible* aAccessible) override;
virtual nsresult HandleAccEvent(AccEvent* aEvent) MOZ_OVERRIDE;
virtual nsresult HandleAccEvent(AccEvent* aEvent) override;
/**
* Ignored means that the accessible might still have children, but is not

2
accessible/windows/ia2/ia2AccessibleRelation.h
View File

@ -19,7 +19,7 @@
namespace mozilla {
namespace a11y {
class ia2AccessibleRelation MOZ_FINAL : public IAccessibleRelation
class ia2AccessibleRelation final : public IAccessibleRelation
{
public:
ia2AccessibleRelation(RelationType aType, Relation* aRel);

4
accessible/windows/msaa/ARIAGridAccessibleWrap.h
View File

@ -34,7 +34,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
/**
@ -56,7 +56,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
} // namespace a11y

2
accessible/windows/msaa/AccessibleWrap.cpp
View File

@ -657,7 +657,7 @@ AccessibleWrap::get_accFocus(
* This helper class implements IEnumVARIANT for a nsTArray containing
* accessible objects.
*/
class AccessibleEnumerator MOZ_FINAL : public IEnumVARIANT
class AccessibleEnumerator final : public IEnumVARIANT
{
public:
AccessibleEnumerator(const nsTArray<Accessible*>& aArray) :

2
accessible/windows/msaa/AccessibleWrap.h
View File

@ -171,7 +171,7 @@ public: // construction, destruction
*/
Accessible* GetXPAccessibleFor(const VARIANT& aVarChild);
virtual void GetNativeInterface(void **aOutAccessible) MOZ_OVERRIDE;
virtual void GetNativeInterface(void **aOutAccessible) override;
static IDispatch* NativeAccessible(Accessible* aAccessible);

2
accessible/windows/msaa/ApplicationAccessibleWrap.h
View File

@ -25,7 +25,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsAccessible
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
// IUnknown
STDMETHODIMP QueryInterface(REFIID, void**);

2
accessible/windows/msaa/EnumVariant.h
View File

@ -16,7 +16,7 @@ namespace a11y {
/**
* Used to fetch accessible children.
*/
class ChildrenEnumVariant MOZ_FINAL : public IEnumVARIANT
class ChildrenEnumVariant final : public IEnumVARIANT
{
public:
ChildrenEnumVariant(AccessibleWrap* aAnchor) : mAnchorAcc(aAnchor),

6
accessible/windows/msaa/HTMLTableAccessibleWrap.h
View File

@ -35,7 +35,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
@ -58,7 +58,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
@ -83,7 +83,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
} // namespace a11y

2
accessible/windows/msaa/HTMLWin32ObjectAccessible.h
View File

@ -55,7 +55,7 @@ public:
HTMLWin32ObjectAccessible(void* aHwnd, DocAccessible* aDoc);
virtual ~HTMLWin32ObjectAccessible() {}
virtual void GetNativeInterface(void** aNativeAccessible) MOZ_OVERRIDE;
virtual void GetNativeInterface(void** aNativeAccessible) override;
protected:
void* mHwnd;

4
accessible/windows/msaa/IUnknownImpl.h
View File

@ -51,13 +51,13 @@ private:
#define DECL_IUNKNOWN \
public: \
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**); \
virtual ULONG STDMETHODCALLTYPE AddRef() MOZ_FINAL \
virtual ULONG STDMETHODCALLTYPE AddRef() final \
{ \
MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt"); \
++mRefCnt; \
return mRefCnt; \
} \
virtual ULONG STDMETHODCALLTYPE Release() MOZ_FINAL \
virtual ULONG STDMETHODCALLTYPE Release() final \
{ \
MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release"); \
--mRefCnt; \

2
accessible/windows/msaa/Platform.cpp
View File

@ -45,7 +45,7 @@ class ProxyAccessibleWrap : public AccessibleWrap
mBits.proxy = aProxy;
}
virtual void Shutdown() MOZ_OVERRIDE
virtual void Shutdown() override
{
mBits.proxy = nullptr;
}

2
accessible/windows/msaa/ServiceProvider.h
View File

@ -15,7 +15,7 @@
namespace mozilla {
namespace a11y {
class ServiceProvider MOZ_FINAL : public IServiceProvider
class ServiceProvider final : public IServiceProvider
{
public:
ServiceProvider(AccessibleWrap* aAcc) : mAccessible(aAcc) {}

4
accessible/windows/msaa/XULListboxAccessibleWrap.h
View File

@ -33,7 +33,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
/**
@ -55,7 +55,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
} // namespace a11y

4
accessible/windows/msaa/XULTreeGridAccessibleWrap.h
View File

@ -34,7 +34,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
/**
@ -62,7 +62,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
};
} // namespace a11y

2
accessible/windows/sdn/sdnAccessible.h
View File

@ -16,7 +16,7 @@
namespace mozilla {
namespace a11y {
class sdnAccessible MOZ_FINAL : public ISimpleDOMNode
class sdnAccessible final : public ISimpleDOMNode
{
public:
sdnAccessible(nsINode* aNode) :

2
accessible/windows/sdn/sdnDocAccessible.h
View File

@ -15,7 +15,7 @@
namespace mozilla {
namespace a11y {
class sdnDocAccessible MOZ_FINAL : public ISimpleDOMDocument
class sdnDocAccessible final : public ISimpleDOMDocument
{
public:
sdnDocAccessible(DocAccessibleWrap* aAccessible) : mAccessible(aAccessible) {};

2
accessible/windows/sdn/sdnTextAccessible.h
View File

@ -18,7 +18,7 @@ struct nsPoint;
namespace mozilla {
namespace a11y {
class sdnTextAccessible MOZ_FINAL : public ISimpleDOMText
class sdnTextAccessible final : public ISimpleDOMText
{
public:
sdnTextAccessible(AccessibleWrap* aAccessible) : mAccessible(aAccessible) {};

2
accessible/windows/uia/uiaRawElmProvider.h
View File

@ -20,7 +20,7 @@ class AccessibleWrap;
/**
* IRawElementProviderSimple implementation (maintains IAccessibleEx approach).
*/
class uiaRawElmProvider MOZ_FINAL : public IAccessibleEx,
class uiaRawElmProvider final : public IAccessibleEx,
public IRawElementProviderSimple
{
public:

2
accessible/xpcom/nsAccessibleRelation.h
View File

@ -20,7 +20,7 @@ class Relation;
/**
* Class represents an accessible relation.
*/
class nsAccessibleRelation MOZ_FINAL : public nsIAccessibleRelation
class nsAccessibleRelation final : public nsIAccessibleRelation
{
public:
nsAccessibleRelation(uint32_t aType, Relation* aRel);

78
accessible/xpcom/xpcAccessible.h
View File

@ -24,68 +24,68 @@ class xpcAccessible : public nsIAccessible
{
public:
// nsIAccessible
NS_IMETHOD GetParent(nsIAccessible** aParent) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetNextSibling(nsIAccessible** aNextSibling) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetParent(nsIAccessible** aParent) final override;
NS_IMETHOD GetNextSibling(nsIAccessible** aNextSibling) final override;
NS_IMETHOD GetPreviousSibling(nsIAccessible** aPreviousSibling)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetFirstChild(nsIAccessible** aFirstChild) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetLastChild(nsIAccessible** aLastChild) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetChildCount(int32_t* aChildCount) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetFirstChild(nsIAccessible** aFirstChild) final override;
NS_IMETHOD GetLastChild(nsIAccessible** aLastChild) final override;
NS_IMETHOD GetChildCount(int32_t* aChildCount) final override;
NS_IMETHOD GetChildAt(int32_t aChildIndex, nsIAccessible** aChild)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetChildren(nsIArray** aChildren) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetIndexInParent(int32_t* aIndexInParent) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetChildren(nsIArray** aChildren) final override;
NS_IMETHOD GetIndexInParent(int32_t* aIndexInParent) final override;
NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode) final override;
NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument) final override;
NS_IMETHOD GetRootDocument(nsIAccessibleDocument** aRootDocument)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetRole(uint32_t* aRole) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRole(uint32_t* aRole) final override;
NS_IMETHOD GetState(uint32_t* aState, uint32_t* aExtraState)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetDescription(nsAString& aDescription) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetLanguage(nsAString& aLanguage) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetValue(nsAString& aValue) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetHelp(nsAString& aHelp) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetDescription(nsAString& aDescription) final override;
NS_IMETHOD GetName(nsAString& aName) final override;
NS_IMETHOD GetLanguage(nsAString& aLanguage) final override;
NS_IMETHOD GetValue(nsAString& aValue) final override;
NS_IMETHOD GetHelp(nsAString& aHelp) final override;
NS_IMETHOD GetAccessKey(nsAString& aAccessKey) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetKeyboardShortcut(nsAString& aKeyBinding) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetAccessKey(nsAString& aAccessKey) final override;
NS_IMETHOD GetKeyboardShortcut(nsAString& aKeyBinding) final override;
NS_IMETHOD GetAttributes(nsIPersistentProperties** aAttributes)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetBounds(int32_t* aX, int32_t* aY,
int32_t* aWidth, int32_t* aHeight) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aWidth, int32_t* aHeight) final override;
NS_IMETHOD GroupPosition(int32_t* aGroupLevel, int32_t* aSimilarItemsInGroup,
int32_t* aPositionInGroup) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aPositionInGroup) final override;
NS_IMETHOD GetRelationByType(uint32_t aType,
nsIAccessibleRelation** aRelation)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRelations(nsIArray** aRelations) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetRelations(nsIArray** aRelations) final override;
NS_IMETHOD GetFocusedChild(nsIAccessible** aChild) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetFocusedChild(nsIAccessible** aChild) final override;
NS_IMETHOD GetChildAtPoint(int32_t aX, int32_t aY,
nsIAccessible** aAccessible) MOZ_FINAL MOZ_OVERRIDE;
nsIAccessible** aAccessible) final override;
NS_IMETHOD GetDeepestChildAtPoint(int32_t aX, int32_t aY,
nsIAccessible** aAccessible)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD SetSelected(bool aSelect) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD ExtendSelection() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD TakeSelection() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD TakeFocus() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD SetSelected(bool aSelect) final override;
NS_IMETHOD ExtendSelection() final override;
NS_IMETHOD TakeSelection() final override;
NS_IMETHOD TakeFocus() final override;
NS_IMETHOD GetActionCount(uint8_t* aActionCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetActionName(uint8_t aIndex, nsAString& aName) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetActionCount(uint8_t* aActionCount) final override;
NS_IMETHOD GetActionName(uint8_t aIndex, nsAString& aName) final override;
NS_IMETHOD GetActionDescription(uint8_t aIndex, nsAString& aDescription)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD DoAction(uint8_t aIndex) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD DoAction(uint8_t aIndex) final override;
NS_IMETHOD ScrollTo(uint32_t aHow) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD ScrollTo(uint32_t aHow) final override;
NS_IMETHOD ScrollToPoint(uint32_t aCoordinateType,
int32_t aX, int32_t aY) MOZ_FINAL MOZ_OVERRIDE;
int32_t aX, int32_t aY) final override;
protected:
xpcAccessible() { }

8
accessible/xpcom/xpcAccessibleApplication.h
View File

@ -27,10 +27,10 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsIAccessibleApplication
NS_IMETHOD GetAppName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetAppVersion(nsAString& aVersion) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetPlatformName(nsAString& aName) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetPlatformVersion(nsAString& aVersion) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetAppName(nsAString& aName) final override;
NS_IMETHOD GetAppVersion(nsAString& aVersion) final override;
NS_IMETHOD GetPlatformName(nsAString& aName) final override;
NS_IMETHOD GetPlatformVersion(nsAString& aVersion) final override;
protected:
virtual ~xpcAccessibleApplication() {}

22
accessible/xpcom/xpcAccessibleDocument.h
View File

@ -32,27 +32,27 @@ public:
xpcAccessibleGeneric)
// nsIAccessibleDocument
NS_IMETHOD GetURL(nsAString& aURL) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetMimeType(nsAString& aType) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetDocType(nsAString& aType) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetDOMDocument(nsIDOMDocument** aDOMDocument) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetWindow(nsIDOMWindow** aDOMWindow) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetURL(nsAString& aURL) final override;
NS_IMETHOD GetTitle(nsAString& aTitle) final override;
NS_IMETHOD GetMimeType(nsAString& aType) final override;
NS_IMETHOD GetDocType(nsAString& aType) final override;
NS_IMETHOD GetDOMDocument(nsIDOMDocument** aDOMDocument) final override;
NS_IMETHOD GetWindow(nsIDOMWindow** aDOMWindow) final override;
NS_IMETHOD GetParentDocument(nsIAccessibleDocument** aDocument)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetChildDocumentCount(uint32_t* aCount) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetChildDocumentCount(uint32_t* aCount) final override;
NS_IMETHOD GetChildDocumentAt(uint32_t aIndex,
nsIAccessibleDocument** aDocument)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetVirtualCursor(nsIAccessiblePivot** aVirtualCursor)
MOZ_FINAL MOZ_OVERRIDE;
final override;
/**
* Return XPCOM wrapper for the internal accessible.
*/
xpcAccessibleGeneric* GetAccessible(Accessible* aAccessible);
virtual void Shutdown() MOZ_OVERRIDE;
virtual void Shutdown() override;
protected:
virtual ~xpcAccessibleDocument() {}

2
accessible/xpcom/xpcAccessibleGeneric.h
View File

@ -41,7 +41,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(xpcAccessibleGeneric, nsIAccessible)
// nsIAccessible
virtual Accessible* ToInternalAccessible() const MOZ_FINAL MOZ_OVERRIDE;
virtual Accessible* ToInternalAccessible() const final override;
// xpcAccessibleGeneric
virtual void Shutdown();

12
accessible/xpcom/xpcAccessibleHyperLink.h
View File

@ -23,13 +23,13 @@ class Accessible;
class xpcAccessibleHyperLink : public nsIAccessibleHyperLink
{
public:
NS_IMETHOD GetAnchorCount(int32_t* aAnchorCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetStartIndex(int32_t* aStartIndex) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetEndIndex(int32_t* aEndIndex) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetURI(int32_t aIndex, nsIURI** aURI) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetAnchorCount(int32_t* aAnchorCount) final override;
NS_IMETHOD GetStartIndex(int32_t* aStartIndex) final override;
NS_IMETHOD GetEndIndex(int32_t* aEndIndex) final override;
NS_IMETHOD GetURI(int32_t aIndex, nsIURI** aURI) final override;
NS_IMETHOD GetAnchor(int32_t aIndex, nsIAccessible** aAccessible)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetValid(bool* aValid) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetValid(bool* aValid) final override;
protected:
xpcAccessibleHyperLink() { }

4
accessible/xpcom/xpcAccessibleImage.h
View File

@ -24,8 +24,8 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHOD GetImagePosition(uint32_t aCoordType,
int32_t* aX, int32_t* aY) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetImageSize(int32_t* aWidth, int32_t* aHeight) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aX, int32_t* aY) final override;
NS_IMETHOD GetImageSize(int32_t* aWidth, int32_t* aHeight) final override;
protected:
virtual ~xpcAccessibleImage() {}

16
accessible/xpcom/xpcAccessibleSelectable.h
View File

@ -25,17 +25,17 @@ class xpcAccessibleSelectable : public nsIAccessibleSelectable
{
public:
// nsIAccessibleSelectable
NS_IMETHOD GetSelectedItems(nsIArray** aSelectedItems) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetSelectedItems(nsIArray** aSelectedItems) final override;
NS_IMETHOD GetSelectedItemCount(uint32_t* aSelectedItemCount)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedItemAt(uint32_t aIndex, nsIAccessible** aItem)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD IsItemSelected(uint32_t aIndex, bool* aIsSelected)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD AddItemToSelection(uint32_t aIndex) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD RemoveItemFromSelection(uint32_t aIndex) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD SelectAll(bool* aIsMultiSelect) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD UnselectAll() MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD AddItemToSelection(uint32_t aIndex) final override;
NS_IMETHOD RemoveItemFromSelection(uint32_t aIndex) final override;
NS_IMETHOD SelectAll(bool* aIsMultiSelect) final override;
NS_IMETHOD UnselectAll() final override;
protected:
xpcAccessibleSelectable() { }

58
accessible/xpcom/xpcAccessibleTable.h
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++ MOZ_FINAL; tab-width: 2 MOZ_FINAL; indent-tabs-mode: nil MOZ_FINAL; c-basic-offset: 2 -*- */
/* -*- Mode: C++ final; tab-width: 2 final; indent-tabs-mode: nil final; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
@ -26,55 +26,55 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsIAccessibleTable
NS_IMETHOD GetCaption(nsIAccessible** aCaption) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetSummary(nsAString& aSummary) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetColumnCount(int32_t* aColumnCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRowCount(int32_t* aRowCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetCaption(nsIAccessible** aCaption) final override;
NS_IMETHOD GetSummary(nsAString& aSummary) final override;
NS_IMETHOD GetColumnCount(int32_t* aColumnCount) final override;
NS_IMETHOD GetRowCount(int32_t* aRowCount) final override;
NS_IMETHOD GetCellAt(int32_t aRowIndex, int32_t aColumnIndex,
nsIAccessible** aCell) MOZ_FINAL MOZ_OVERRIDE;
nsIAccessible** aCell) final override;
NS_IMETHOD GetCellIndexAt(int32_t aRowIndex, int32_t aColumnIndex,
int32_t* aCellIndex) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aCellIndex) final override;
NS_IMETHOD GetColumnIndexAt(int32_t aCellIndex, int32_t* aColumnIndex)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetRowIndexAt(int32_t aCellIndex, int32_t* aRowIndex)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetRowAndColumnIndicesAt(int32_t aCellIndex, int32_t* aRowIndex,
int32_t* aColumnIndex)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetColumnExtentAt(int32_t row, int32_t column,
int32_t* aColumnExtent) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aColumnExtent) final override;
NS_IMETHOD GetRowExtentAt(int32_t row, int32_t column,
int32_t* aRowExtent) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aRowExtent) final override;
NS_IMETHOD GetColumnDescription(int32_t aColIdx, nsAString& aDescription)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetRowDescription(int32_t aRowIdx, nsAString& aDescription)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD IsColumnSelected(int32_t aColIdx, bool* _retval)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD IsRowSelected(int32_t aRowIdx, bool* _retval)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD IsCellSelected(int32_t aRowIdx, int32_t aColIdx, bool* _retval)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedCellCount(uint32_t* aSelectedCellCount)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedColumnCount(uint32_t* aSelectedColumnCount)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedRowCount(uint32_t* aSelectedRowCount)
MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetSelectedCells(nsIArray** aSelectedCell) MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedCells(nsIArray** aSelectedCell) final override;
NS_IMETHOD GetSelectedCellIndices(uint32_t* aCellsArraySize,
int32_t** aCellsArray)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedColumnIndices(uint32_t* aColsArraySize,
int32_t** aColsArray)
MOZ_FINAL MOZ_OVERRIDE;
final override;
NS_IMETHOD GetSelectedRowIndices(uint32_t* aRowsArraySize,
int32_t** aRowsArray) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD SelectColumn(int32_t aColIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD SelectRow(int32_t aRowIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD UnselectColumn(int32_t aColIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD UnselectRow(int32_t aRowIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD IsProbablyForLayout(bool* aIsForLayout) MOZ_FINAL MOZ_OVERRIDE;
int32_t** aRowsArray) final override;
NS_IMETHOD SelectColumn(int32_t aColIdx) final override;
NS_IMETHOD SelectRow(int32_t aRowIdx) final override;
NS_IMETHOD UnselectColumn(int32_t aColIdx) final override;
NS_IMETHOD UnselectRow(int32_t aRowIdx) final override;
NS_IMETHOD IsProbablyForLayout(bool* aIsForLayout) final override;
protected:
virtual ~xpcAccessibleTable() {}

16
accessible/xpcom/xpcAccessibleTableCell.h
View File

@ -27,14 +27,14 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsIAccessibleTableCell
NS_IMETHOD GetTable(nsIAccessibleTable** aTable) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetColumnIndex(int32_t* aColIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRowIndex(int32_t* aRowIdx) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetColumnExtent(int32_t* aExtent) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRowExtent(int32_t* aExtent) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetColumnHeaderCells(nsIArray** aHeaderCells) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetRowHeaderCells(nsIArray** aHeaderCells) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD IsSelected(bool* aSelected) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetTable(nsIAccessibleTable** aTable) final override;
NS_IMETHOD GetColumnIndex(int32_t* aColIdx) final override;
NS_IMETHOD GetRowIndex(int32_t* aRowIdx) final override;
NS_IMETHOD GetColumnExtent(int32_t* aExtent) final override;
NS_IMETHOD GetRowExtent(int32_t* aExtent) final override;
NS_IMETHOD GetColumnHeaderCells(nsIArray** aHeaderCells) final override;
NS_IMETHOD GetRowHeaderCells(nsIArray** aHeaderCells) final override;
NS_IMETHOD IsSelected(bool* aSelected) final override;
protected:
virtual ~xpcAccessibleTableCell() {}

42
accessible/xpcom/xpcAccessibleTextRange.h
View File

@ -26,37 +26,37 @@ class TextRange;
{ 0xbb, 0x62, 0x6d, 0x5b, 0xf1, 0xef, 0x91, 0x0c } \
}
class xpcAccessibleTextRange MOZ_FINAL : public nsIAccessibleTextRange
class xpcAccessibleTextRange final : public nsIAccessibleTextRange
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(xpcAccessibleTextRange)
NS_IMETHOD GetStartContainer(nsIAccessibleText** aAnchor) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetStartOffset(int32_t* aOffset) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetEndContainer(nsIAccessibleText** aAnchor) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetEndOffset(int32_t* aOffset) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetContainer(nsIAccessible** aContainer) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetEmbeddedChildren(nsIArray** aList) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD Compare(nsIAccessibleTextRange* aOtherRange, bool* aResult) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetStartContainer(nsIAccessibleText** aAnchor) final override;
NS_IMETHOD GetStartOffset(int32_t* aOffset) final override;
NS_IMETHOD GetEndContainer(nsIAccessibleText** aAnchor) final override;
NS_IMETHOD GetEndOffset(int32_t* aOffset) final override;
NS_IMETHOD GetContainer(nsIAccessible** aContainer) final override;
NS_IMETHOD GetEmbeddedChildren(nsIArray** aList) final override;
NS_IMETHOD Compare(nsIAccessibleTextRange* aOtherRange, bool* aResult) final override;
NS_IMETHOD CompareEndPoints(uint32_t aEndPoint,
nsIAccessibleTextRange* aOtherRange,
uint32_t aOtherRangeEndPoint,
int32_t* aResult) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetText(nsAString& aText) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetBounds(nsIArray** aRectList) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD Move(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD MoveStart(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD MoveEnd(uint32_t aUnit, int32_t aCount) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD Normalize(uint32_t aUnit) MOZ_FINAL MOZ_OVERRIDE;
int32_t* aResult) final override;
NS_IMETHOD GetText(nsAString& aText) final override;
NS_IMETHOD GetBounds(nsIArray** aRectList) final override;
NS_IMETHOD Move(uint32_t aUnit, int32_t aCount) final override;
NS_IMETHOD MoveStart(uint32_t aUnit, int32_t aCount) final override;
NS_IMETHOD MoveEnd(uint32_t aUnit, int32_t aCount) final override;
NS_IMETHOD Normalize(uint32_t aUnit) final override;
NS_IMETHOD FindText(const nsAString& aText, bool aIsBackward, bool aIsIgnoreCase,
nsIAccessibleTextRange** aRange) MOZ_FINAL MOZ_OVERRIDE;
nsIAccessibleTextRange** aRange) final override;
NS_IMETHOD FindAttr(uint32_t aAttr, nsIVariant* aVal, bool aIsBackward,
nsIAccessibleTextRange** aRange) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD AddToSelection() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD RemoveFromSelection() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD Select() MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD ScrollIntoView(uint32_t aHow) MOZ_FINAL MOZ_OVERRIDE;
nsIAccessibleTextRange** aRange) final override;
NS_IMETHOD AddToSelection() final override;
NS_IMETHOD RemoveFromSelection() final override;
NS_IMETHOD Select() final override;
NS_IMETHOD ScrollIntoView(uint32_t aHow) final override;
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ACCESSIBLETEXTRANGE_IMPL_IID)

10
accessible/xpcom/xpcAccessibleValue.h
View File

@ -21,11 +21,11 @@ class Accessible;
class xpcAccessibleValue : public nsIAccessibleValue
{
public:
NS_IMETHOD GetMaximumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetMinimumValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetCurrentValue(double* aValue) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD SetCurrentValue(double aValue) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetMinimumIncrement(double* aMinIncrement) MOZ_FINAL MOZ_OVERRIDE;
NS_IMETHOD GetMaximumValue(double* aValue) final override;
NS_IMETHOD GetMinimumValue(double* aValue) final override;
NS_IMETHOD GetCurrentValue(double* aValue) final override;
NS_IMETHOD SetCurrentValue(double aValue) final override;
NS_IMETHOD GetMinimumIncrement(double* aMinIncrement) final override;
protected:
xpcAccessibleValue() { }

10
accessible/xul/XULAlertAccessible.h
View File

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

22
accessible/xul/XULColorPickerAccessible.h
View File

@ -21,13 +21,13 @@ public:
DocAccessible* aDoc);
// Accessible
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;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
// Widgets
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
};
@ -40,15 +40,15 @@ public:
XULColorPickerAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const override;
};
} // namespace a11y

20
accessible/xul/XULComboboxAccessible.h
View File

@ -22,20 +22,20 @@ public:
XULComboboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
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 bool CanHaveAnonChildren() MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) override;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual bool CanHaveAnonChildren() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
};
} // namespace a11y

44
accessible/xul/XULElementAccessibles.h
View File

@ -23,17 +23,17 @@ public:
XULLabelAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual Relation RelationByType(RelationType aType) override;
void UpdateLabelValue(const nsString& aValue);
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual void CacheChildren() MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
virtual void CacheChildren() override;
private:
nsRefPtr<XULLabelTextLeafAccessible> mValueTextLeaf;
@ -50,7 +50,7 @@ Accessible::AsXULLabel()
* Used to implement text interface on XUL label accessible in case when text
* is provided by @value attribute (no underlying text frame).
*/
class XULLabelTextLeafAccessible MOZ_FINAL : public TextLeafAccessibleWrap
class XULLabelTextLeafAccessible final : public TextLeafAccessibleWrap
{
public:
XULLabelTextLeafAccessible(nsIContent* aContent, DocAccessible* aDoc) :
@ -60,8 +60,8 @@ public:
virtual ~XULLabelTextLeafAccessible() { }
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
};
@ -75,8 +75,8 @@ public:
XULTooltipAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
};
class XULLinkAccessible : public XULLabelAccessible
@ -86,26 +86,26 @@ public:
XULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeLinkState() const MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeLinkState() const 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// HyperLinkAccessible
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;
virtual bool IsLink() override;
virtual uint32_t StartOffset() override;
virtual uint32_t EndOffset() override;
virtual already_AddRefed<nsIURI> AnchorURIAt(uint32_t aAnchorIndex) override;
protected:
virtual ~XULLinkAccessible();
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
enum { eAction_Jump = 0 };

76
accessible/xul/XULFormControlAccessible.h
View File

@ -36,21 +36,21 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
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 IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* ContainerWidget() const override;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const MOZ_OVERRIDE;
virtual bool IsAcceptableChild(Accessible* aPossibleChild) const override;
protected:
virtual ~XULButtonAccessible();
@ -70,13 +70,13 @@ public:
XULCheckboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
};
/**
@ -89,13 +89,13 @@ public:
XULDropmarkerAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
private:
bool DropmarkerOpen(bool aToggleOpen) const;
@ -104,18 +104,18 @@ private:
/**
* Used for XUL groupbox element.
*/
class XULGroupboxAccessible MOZ_FINAL : public AccessibleWrap
class XULGroupboxAccessible final : public AccessibleWrap
{
public:
XULGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual Relation RelationByType(RelationType aType) override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -128,11 +128,11 @@ public:
XULRadioButtonAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
// Widgets
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
};
/**
@ -144,13 +144,13 @@ public:
XULRadioGroupAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeInteractiveState() const override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
};
/**
@ -162,7 +162,7 @@ public:
XULStatusBarAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
};
/**
@ -175,7 +175,7 @@ public:
// Accessible
virtual void GetPositionAndSizeInternal(int32_t* aPosInSet,
int32_t* aSetSize) MOZ_OVERRIDE;
int32_t* aSetSize) override;
// nsXULToolbarButtonAccessible
static bool IsSeparator(Accessible* aAccessible);
@ -190,11 +190,11 @@ public:
XULToolbarAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -207,8 +207,8 @@ public:
DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual mozilla::a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
};
} // namespace a11y

94
accessible/xul/XULListboxAccessible.h
View File

@ -29,8 +29,8 @@ public:
XULColumAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
};
/**
@ -43,13 +43,13 @@ public:
XULColumnItemAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
enum { eAction_Click = 0 };
};
@ -64,35 +64,35 @@ public:
XULListboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
// TableAccessible
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; }
virtual uint32_t ColCount() override;
virtual uint32_t RowCount() override;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override;
virtual bool IsColSelected(uint32_t aColIdx) override;
virtual bool IsRowSelected(uint32_t aRowIdx) override;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual uint32_t SelectedCellCount() override;
virtual uint32_t SelectedColCount() override;
virtual uint32_t SelectedRowCount() override;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) override;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) override;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) override;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) override;
virtual void SelectRow(uint32_t aRowIdx) override;
virtual void UnselectRow(uint32_t aRowIdx) override;
virtual Accessible* AsAccessible() override { return this; }
// Accessible
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;
virtual void Value(nsString& aValue) override;
virtual TableAccessible* AsTable() override { return this; }
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
protected:
virtual ~XULListboxAccessible() {}
@ -113,23 +113,23 @@ public:
XULListitemAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
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() MOZ_OVERRIDE;
virtual void Description(nsString& aDesc) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual bool CanHaveAnonChildren() override;
// Actions
virtual void ActionNameAt(uint8_t index, nsAString& aName) MOZ_OVERRIDE;
virtual void ActionNameAt(uint8_t index, nsAString& aName) override;
// Widgets
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
protected:
virtual ~XULListitemAccessible();
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
// XULListitemAccessible
@ -155,16 +155,16 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// Accessible
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual TableCellAccessible* AsTableCell() override { return this; }
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual a11y::role NativeRole() override;
// TableCellAccessible
virtual TableAccessible* Table() const MOZ_OVERRIDE;
virtual uint32_t ColIdx() const MOZ_OVERRIDE;
virtual uint32_t RowIdx() const MOZ_OVERRIDE;
virtual void ColHeaderCells(nsTArray<Accessible*>* aHeaderCells) MOZ_OVERRIDE;
virtual bool Selected() MOZ_OVERRIDE;
virtual TableAccessible* Table() const override;
virtual uint32_t ColIdx() const override;
virtual uint32_t RowIdx() const override;
virtual void ColHeaderCells(nsTArray<Accessible*>* aHeaderCells) override;
virtual bool Selected() override;
protected:
virtual ~XULListCellAccessible() {}

68
accessible/xul/XULMenuAccessible.h
View File

@ -24,29 +24,29 @@ public:
XULMenuitemAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
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() MOZ_OVERRIDE;
virtual void Description(nsString& aDescription) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual int32_t GetLevelInternal() override;
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren() 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 MOZ_OVERRIDE;
virtual KeyBinding KeyboardShortcut() const MOZ_OVERRIDE;
virtual uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
virtual KeyBinding AccessKey() const override;
virtual KeyBinding KeyboardShortcut() const override;
// Widgets
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* ContainerWidget() const override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -58,17 +58,17 @@ public:
XULMenuSeparatorAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
@ -81,19 +81,19 @@ public:
XULMenupopupAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
// Widgets
virtual bool IsWidget() const MOZ_OVERRIDE;
virtual bool IsActiveWidget() const MOZ_OVERRIDE;
virtual bool AreItemsOperable() const MOZ_OVERRIDE;
virtual bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
/**
@ -105,17 +105,17 @@ public:
XULMenubarAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
// Widget
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 bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* CurrentItem() override;
virtual void SetCurrentItem(Accessible* aItem) override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
} // namespace a11y

22
accessible/xul/XULSelectControlAccessible.h
View File

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

28
accessible/xul/XULSliderAccessible.h
View File

@ -22,23 +22,23 @@ public:
XULSliderAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual bool NativelyUnavailable() const MOZ_OVERRIDE;
virtual bool CanHaveAnonChildren() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeInteractiveState() const override;
virtual bool NativelyUnavailable() const override;
virtual bool CanHaveAnonChildren() override;
// Value
virtual double MaxValue() const MOZ_OVERRIDE;
virtual double MinValue() const MOZ_OVERRIDE;
virtual double CurValue() const MOZ_OVERRIDE;
virtual double Step() const MOZ_OVERRIDE;
virtual bool SetCurValue(double aValue) MOZ_OVERRIDE;
virtual double MaxValue() const override;
virtual double MinValue() const override;
virtual double CurValue() const override;
virtual double Step() const override;
virtual bool SetCurValue(double aValue) 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
protected:
/**
@ -66,7 +66,7 @@ public:
XULThumbAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
};
} // namespace a11y

28
accessible/xul/XULTabAccessible.h
View File

@ -24,15 +24,15 @@ public:
XULTabAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual Relation RelationByType(RelationType aType) 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
};
@ -45,15 +45,15 @@ public:
XULTabsAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual void Value(nsString& aValue) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
// ActionAccessible
virtual uint8_t ActionCount() MOZ_OVERRIDE;
virtual uint8_t ActionCount() override;
protected:
// Accessible
virtual ENameValueFlag NativeName(nsString& aName) MOZ_OVERRIDE;
virtual ENameValueFlag NativeName(nsString& aName) override;
};
@ -68,7 +68,7 @@ public:
{ mType = eXULTabpanelsType; }
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
};
@ -85,8 +85,8 @@ public:
XULTabpanelAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual a11y::role NativeRole() override;
virtual Relation RelationByType(RelationType aType) override;
};
} // namespace a11y

88
accessible/xul/XULTreeAccessible.h
View File

@ -39,35 +39,35 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(XULTreeAccessible, Accessible)
// Accessible
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 void Shutdown() override;
virtual void Value(nsString& aValue) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
EWhichChildAtPoint aWhichChild) override;
virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t ChildCount() const MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Accessible* GetChildAt(uint32_t aIndex) const override;
virtual uint32_t ChildCount() const override;
virtual Relation RelationByType(RelationType aType) override;
// SelectAccessible
virtual void SelectedItems(nsTArray<Accessible*>* aItems) MOZ_OVERRIDE;
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;
virtual void SelectedItems(nsTArray<Accessible*>* aItems) override;
virtual uint32_t SelectedItemCount() override;
virtual Accessible* GetSelectedItem(uint32_t aIndex) override;
virtual bool IsItemSelected(uint32_t aIndex) override;
virtual bool AddItemToSelection(uint32_t aIndex) override;
virtual bool RemoveItemFromSelection(uint32_t aIndex) override;
virtual bool SelectAll() override;
virtual bool UnselectAll() override;
// Widgets
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 bool IsWidget() const override;
virtual bool IsActiveWidget() const override;
virtual bool AreItemsOperable() const override;
virtual Accessible* CurrentItem() override;
virtual void SetCurrentItem(Accessible* aItem) override;
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const override;
// XULTreeAccessible
@ -145,24 +145,24 @@ public:
AccessibleWrap)
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual nsIntRect Bounds() const MOZ_OVERRIDE;
virtual GroupPos GroupPosition() MOZ_OVERRIDE;
virtual uint64_t NativeState() MOZ_OVERRIDE;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual int32_t IndexInParent() const MOZ_OVERRIDE;
virtual Relation RelationByType(RelationType aType) MOZ_OVERRIDE;
virtual Accessible* FocusedChild() MOZ_OVERRIDE;
virtual void SetSelected(bool aSelect) MOZ_OVERRIDE;
virtual void TakeFocus() MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual nsIntRect Bounds() const override;
virtual GroupPos GroupPosition() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override;
virtual int32_t IndexInParent() const override;
virtual Relation RelationByType(RelationType aType) override;
virtual Accessible* FocusedChild() override;
virtual void SetSelected(bool aSelect) override;
virtual void TakeFocus() 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// Widgets
virtual Accessible* ContainerWidget() const MOZ_OVERRIDE;
virtual Accessible* ContainerWidget() const 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) MOZ_OVERRIDE;
virtual void DispatchClickEvent(nsIContent *aContent, uint32_t aActionIndex) override;
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult *aError = nullptr) const MOZ_OVERRIDE;
nsresult *aError = nullptr) const override;
// XULTreeItemAccessibleBase
@ -231,18 +231,18 @@ public:
XULTreeItemAccessibleBase)
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual ENameValueFlag Name(nsString& aName) override;
virtual a11y::role NativeRole() override;
// XULTreeItemAccessibleBase
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE;
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) override;
protected:
virtual ~XULTreeItemAccessible();
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
// XULTreeItemAccessible
nsCOMPtr<nsITreeColumn> mColumn;
@ -263,7 +263,7 @@ protected:
// Accessible
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult* aError = nullptr) const
MOZ_OVERRIDE;
override;
};

102
accessible/xul/XULTreeGridAccessible.h
View File

@ -30,34 +30,34 @@ public:
{ mGenericTypes |= eTable; }
// TableAccessible
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; }
virtual uint32_t ColCount() override;
virtual uint32_t RowCount() override;
virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex) override;
virtual void ColDescription(uint32_t aColIdx, nsString& aDescription) override;
virtual bool IsColSelected(uint32_t aColIdx) override;
virtual bool IsRowSelected(uint32_t aRowIdx) override;
virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx) override;
virtual uint32_t SelectedCellCount() override;
virtual uint32_t SelectedColCount() override;
virtual uint32_t SelectedRowCount() override;
virtual void SelectedCells(nsTArray<Accessible*>* aCells) override;
virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells) override;
virtual void SelectedColIndices(nsTArray<uint32_t>* aCols) override;
virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows) override;
virtual void SelectRow(uint32_t aRowIdx) override;
virtual void UnselectRow(uint32_t aRowIdx) override;
virtual Accessible* AsAccessible() override { return this; }
// Accessible
virtual TableAccessible* AsTable() MOZ_OVERRIDE { return this; }
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual TableAccessible* AsTable() override { return this; }
virtual a11y::role NativeRole() override;
protected:
virtual ~XULTreeGridAccessible();
// XULTreeAccessible
virtual already_AddRefed<Accessible>
CreateTreeItemAccessible(int32_t aRow) const MOZ_OVERRIDE;
CreateTreeItemAccessible(int32_t aRow) const override;
};
@ -65,7 +65,7 @@ protected:
* Represents accessible for XUL tree item in the case when XUL tree has
* multiple columns.
*/
class XULTreeGridRowAccessible MOZ_FINAL : public XULTreeItemAccessibleBase
class XULTreeGridRowAccessible final : public XULTreeItemAccessibleBase
{
public:
using Accessible::GetChildAt;
@ -80,25 +80,25 @@ public:
XULTreeItemAccessibleBase)
// Accessible
virtual void Shutdown() MOZ_OVERRIDE;
virtual a11y::role NativeRole() MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual void Shutdown() override;
virtual a11y::role NativeRole() override;
virtual ENameValueFlag Name(nsString& aName) override;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild) MOZ_OVERRIDE;
EWhichChildAtPoint aWhichChild) override;
virtual Accessible* GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t ChildCount() const MOZ_OVERRIDE;
virtual Accessible* GetChildAt(uint32_t aIndex) const override;
virtual uint32_t ChildCount() const override;
// XULTreeItemAccessibleBase
virtual XULTreeGridCellAccessible* GetCellAccessible(nsITreeColumn* aColumn)
const MOZ_OVERRIDE MOZ_FINAL;
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) MOZ_OVERRIDE;
const override final;
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) override;
protected:
virtual ~XULTreeGridRowAccessible();
// Accessible
virtual void CacheChildren() MOZ_OVERRIDE;
virtual void CacheChildren() override;
// XULTreeItemAccessibleBase
mutable nsRefPtrHashtable<nsPtrHashKey<const void>, XULTreeGridCellAccessible>
@ -127,29 +127,29 @@ public:
LeafAccessible)
// Accessible
virtual TableCellAccessible* AsTableCell() MOZ_OVERRIDE { return this; }
virtual nsIntRect Bounds() const MOZ_OVERRIDE;
virtual ENameValueFlag Name(nsString& aName) MOZ_OVERRIDE;
virtual Accessible* FocusedChild() MOZ_OVERRIDE;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
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;
virtual uint64_t NativeInteractiveState() const MOZ_OVERRIDE;
virtual TableCellAccessible* AsTableCell() override { return this; }
virtual nsIntRect Bounds() const override;
virtual ENameValueFlag Name(nsString& aName) override;
virtual Accessible* FocusedChild() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual int32_t IndexInParent() const override;
virtual Relation RelationByType(RelationType aType) override;
virtual a11y::role NativeRole() override;
virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const 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 uint8_t ActionCount() override;
virtual void ActionNameAt(uint8_t aIndex, nsAString& aName) override;
virtual bool DoAction(uint8_t aIndex) override;
// TableCellAccessible
virtual TableAccessible* Table() const MOZ_OVERRIDE;
virtual uint32_t ColIdx() const MOZ_OVERRIDE;
virtual uint32_t RowIdx() const MOZ_OVERRIDE;
virtual void ColHeaderCells(nsTArray<Accessible*>* aHeaderCells) MOZ_OVERRIDE;
virtual void RowHeaderCells(nsTArray<Accessible*>* aCells) MOZ_OVERRIDE { }
virtual bool Selected() MOZ_OVERRIDE;
virtual TableAccessible* Table() const override;
virtual uint32_t ColIdx() const override;
virtual uint32_t RowIdx() const override;
virtual void ColHeaderCells(nsTArray<Accessible*>* aHeaderCells) override;
virtual void RowHeaderCells(nsTArray<Accessible*>* aCells) override { }
virtual bool Selected() override;
/**
* Fire name or state change event if the accessible text or value has been
@ -163,8 +163,8 @@ protected:
// Accessible
virtual Accessible* GetSiblingAtOffset(int32_t aOffset,
nsresult* aError = nullptr) const MOZ_OVERRIDE;
virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex) MOZ_OVERRIDE;
nsresult* aError = nullptr) const override;
virtual void DispatchClickEvent(nsIContent* aContent, uint32_t aActionIndex) override;
// XULTreeGridCellAccessible

4
browser/components/dirprovider/DirectoryProvider.h
View File

@ -17,7 +17,7 @@
namespace mozilla {
namespace browser {
class DirectoryProvider MOZ_FINAL : public nsIDirectoryServiceProvider2
class DirectoryProvider final : public nsIDirectoryServiceProvider2
{
public:
NS_DECL_ISUPPORTS
@ -27,7 +27,7 @@ public:
private:
~DirectoryProvider() {}
class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator
class AppendingEnumerator final : public nsISimpleEnumerator
{
public:
NS_DECL_ISUPPORTS

2
browser/components/feeds/nsFeedSniffer.h
View File

@ -9,7 +9,7 @@
#include "nsStringAPI.h"
#include "mozilla/Attributes.h"
class nsFeedSniffer MOZ_FINAL : public nsIContentSniffer,
class nsFeedSniffer final : public nsIContentSniffer,
nsIStreamListener
{
public:

2
browser/components/migration/nsIEHistoryEnumerator.h
View File

@ -12,7 +12,7 @@
#include "nsIWritablePropertyBag2.h"
#include "nsAutoPtr.h"
class nsIEHistoryEnumerator MOZ_FINAL : public nsISimpleEnumerator
class nsIEHistoryEnumerator final : public nsISimpleEnumerator
{
public:
NS_DECL_ISUPPORTS

2
browser/components/shell/nsGNOMEShellService.h
View File

@ -10,7 +10,7 @@
#include "nsStringAPI.h"
#include "mozilla/Attributes.h"
class nsGNOMEShellService MOZ_FINAL : public nsIShellService
class nsGNOMEShellService final : public nsIShellService
{
public:
nsGNOMEShellService() : mCheckedThisSession(false), mAppIsInPath(false) { }

6
caps/nsNullPrincipal.h
View File

@ -27,7 +27,7 @@ class nsIURI;
#define NS_NULLPRINCIPAL_SCHEME "moz-nullprincipal"
class nsNullPrincipal MOZ_FINAL : public nsJSPrincipals
class nsNullPrincipal final : public nsJSPrincipals
{
public:
nsNullPrincipal();
@ -47,12 +47,12 @@ public:
nsresult Init(uint32_t aAppId = nsIScriptSecurityManager::NO_APP_ID,
bool aInMozBrowser = false);
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
virtual void GetScriptLocation(nsACString &aStr) override;
static nsresult GenerateNullPrincipalURI(nsACString &aStr);
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl() override;
#endif
protected:

6
caps/nsNullPrincipalURI.h
View File

@ -24,7 +24,7 @@
{0x51fcd543, 0x3b52, 0x41f7, \
{0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} }
class nsNullPrincipalURI MOZ_FINAL : public nsIURI
class nsNullPrincipalURI final : public nsIURI
, public nsISizeOf
, public nsIIPCSerializableURI
{
@ -34,8 +34,8 @@ public:
NS_DECL_NSIIPCSERIALIZABLEURI
// nsISizeOf
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override;
explicit nsNullPrincipalURI(const nsCString &aSpec);

82
caps/nsPrincipal.h
View File

@ -44,31 +44,31 @@ protected:
nsCOMPtr<nsIContentSecurityPolicy> mCSP;
};
class nsPrincipal MOZ_FINAL : public nsBasePrincipal
class nsPrincipal final : public nsBasePrincipal
{
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
virtual bool IsOnCSSUnprefixingWhitelist() MOZ_OVERRIDE;
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
NS_IMETHOD GetURI(nsIURI** aURI) override;
NS_IMETHOD GetDomain(nsIURI** aDomain) override;
NS_IMETHOD SetDomain(nsIURI* aDomain) override;
NS_IMETHOD GetOrigin(char** aOrigin) override;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) override;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
virtual bool IsOnCSSUnprefixingWhitelist() override;
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl() override;
#endif
nsPrincipal();
@ -78,7 +78,7 @@ public:
uint32_t aAppId,
bool aInMozBrowser);
virtual void GetScriptLocation(nsACString& aStr) MOZ_OVERRIDE;
virtual void GetScriptLocation(nsACString& aStr) override;
void SetURI(nsIURI* aURI);
static bool IsPrincipalInherited(nsIURI* aURI) {
@ -139,29 +139,29 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIEXPANDEDPRINCIPAL
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) MOZ_OVERRIDE;
NS_IMETHOD GetURI(nsIURI** aURI) MOZ_OVERRIDE;
NS_IMETHOD GetDomain(nsIURI** aDomain) MOZ_OVERRIDE;
NS_IMETHOD SetDomain(nsIURI* aDomain) MOZ_OVERRIDE;
NS_IMETHOD GetOrigin(char** aOrigin) MOZ_OVERRIDE;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) MOZ_OVERRIDE;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) MOZ_OVERRIDE;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) MOZ_OVERRIDE;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) MOZ_OVERRIDE;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) MOZ_OVERRIDE;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) MOZ_OVERRIDE;
virtual bool IsOnCSSUnprefixingWhitelist() MOZ_OVERRIDE;
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD EqualsConsideringDomain(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
NS_IMETHOD GetURI(nsIURI** aURI) override;
NS_IMETHOD GetDomain(nsIURI** aDomain) override;
NS_IMETHOD SetDomain(nsIURI* aDomain) override;
NS_IMETHOD GetOrigin(char** aOrigin) override;
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD SubsumesConsideringDomain(nsIPrincipal* other, bool* _retval) override;
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report, bool allowIfInheritsPrincipal) override;
NS_IMETHOD GetJarPrefix(nsACString& aJarPrefix) override;
NS_IMETHOD GetAppStatus(uint16_t* aAppStatus) override;
NS_IMETHOD GetAppId(uint32_t* aAppStatus) override;
NS_IMETHOD GetIsInBrowserElement(bool* aIsInBrowserElement) override;
NS_IMETHOD GetUnknownAppId(bool* aUnknownAppId) override;
NS_IMETHOD GetIsNullPrincipal(bool* aIsNullPrincipal) override;
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
virtual bool IsOnCSSUnprefixingWhitelist() override;
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl() override;
#endif
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
virtual void GetScriptLocation(nsACString &aStr) override;
private:
nsTArray< nsCOMPtr<nsIPrincipal> > mPrincipals;

2
caps/nsScriptSecurityManager.h
View File

@ -32,7 +32,7 @@ class ClassInfoData;
{ 0x7ee2a4c0, 0x4b93, 0x17d3, \
{ 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }}
class nsScriptSecurityManager MOZ_FINAL : public nsIScriptSecurityManager,
class nsScriptSecurityManager final : public nsIScriptSecurityManager,
public nsIChannelEventSink,
public nsIObserver
{

6
caps/nsSystemPrincipal.h
View File

@ -17,7 +17,7 @@
#define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1"
class nsSystemPrincipal MOZ_FINAL : public nsJSPrincipals
class nsSystemPrincipal final : public nsJSPrincipals
{
public:
// Our refcount is managed by nsJSPrincipals. Use this macro to avoid
@ -28,10 +28,10 @@ public:
nsSystemPrincipal();
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
virtual void GetScriptLocation(nsACString &aStr) override;
#ifdef DEBUG
virtual void dumpImpl() MOZ_OVERRIDE;
virtual void dumpImpl() override;
#endif
protected:

2
chrome/nsChromeProtocolHandler.h
View File

@ -18,7 +18,7 @@
{0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
class nsChromeProtocolHandler MOZ_FINAL : public nsIProtocolHandler,
class nsChromeProtocolHandler final : public nsIProtocolHandler,
public nsSupportsWeakReference
{
public:

16
chrome/nsChromeRegistry.h
View File

@ -47,20 +47,20 @@ public:
NS_DECL_ISUPPORTS
// nsIXULChromeRegistry methods:
NS_IMETHOD ReloadChrome() MOZ_OVERRIDE;
NS_IMETHOD RefreshSkins() MOZ_OVERRIDE;
NS_IMETHOD ReloadChrome() override;
NS_IMETHOD RefreshSkins() override;
NS_IMETHOD AllowScriptsForPackage(nsIURI* url,
bool* _retval) MOZ_OVERRIDE;
bool* _retval) override;
NS_IMETHOD AllowContentToAccess(nsIURI* url,
bool* _retval) MOZ_OVERRIDE;
bool* _retval) override;
NS_IMETHOD CanLoadURLRemotely(nsIURI* url,
bool* _retval) MOZ_OVERRIDE;
bool* _retval) override;
NS_IMETHOD MustLoadURLRemotely(nsIURI* url,
bool* _retval) MOZ_OVERRIDE;
bool* _retval) override;
// nsIChromeRegistry methods:
NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) MOZ_OVERRIDE;
NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) override;
NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) override;
// nsChromeRegistry methods:
nsChromeRegistry() : mInitialized(false) { }

38
chrome/nsChromeRegistryChrome.h
View File

@ -27,24 +27,24 @@ class nsChromeRegistryChrome : public nsChromeRegistry
nsChromeRegistryChrome();
~nsChromeRegistryChrome();
nsresult Init() MOZ_OVERRIDE;
nsresult Init() override;
NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE;
NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE;
NS_IMETHOD CheckForNewChrome() override;
NS_IMETHOD CheckForOSAccessibility() override;
NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
nsIUTF8StringEnumerator* *aResult) override;
NS_IMETHOD IsLocaleRTL(const nsACString& package,
bool *aResult) MOZ_OVERRIDE;
bool *aResult) override;
NS_IMETHOD GetSelectedLocale(const nsACString& aPackage,
nsACString& aLocale) MOZ_OVERRIDE;
nsACString& aLocale) override;
NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic,
const char16_t *someData) MOZ_OVERRIDE;
const char16_t *someData) override;
#ifdef MOZ_XUL
NS_IMETHOD GetXULOverlays(nsIURI *aURI,
nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
nsISimpleEnumerator **_retval) override;
NS_IMETHOD GetStyleOverlays(nsIURI *aURI,
nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
nsISimpleEnumerator **_retval) override;
#endif
// If aChild is non-null then it is a new child to notify. If aChild is
@ -66,12 +66,12 @@ class nsChromeRegistryChrome : public nsChromeRegistry
nsresult OverrideLocalePackage(const nsACString& aPackage,
nsACString& aOverride);
nsresult SelectLocaleFromPref(nsIPrefBranch* prefs);
nsresult UpdateSelectedLocale() MOZ_OVERRIDE;
nsresult UpdateSelectedLocale() override;
nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
const nsCString& aProvider,
const nsCString& aPath) MOZ_OVERRIDE;
const nsCString& aPath) override;
nsresult GetFlagsFromPackage(const nsCString& aPackage,
uint32_t* aFlags) MOZ_OVERRIDE;
uint32_t* aFlags) override;
struct ProviderEntry
{
@ -166,19 +166,19 @@ class nsChromeRegistryChrome : public nsChromeRegistry
nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
};
#endif // nsChromeRegistryChrome_h

36
chrome/nsChromeRegistryContent.h
View File

@ -25,19 +25,19 @@ class nsChromeRegistryContent : public nsChromeRegistry
bool aReset);
NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE;
NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE;
nsIUTF8StringEnumerator* *aResult) override;
NS_IMETHOD CheckForNewChrome() override;
NS_IMETHOD CheckForOSAccessibility() override;
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) MOZ_OVERRIDE;
const char16_t* aData) override;
NS_IMETHOD IsLocaleRTL(const nsACString& package,
bool *aResult) MOZ_OVERRIDE;
bool *aResult) override;
NS_IMETHOD GetSelectedLocale(const nsACString& aPackage,
nsACString& aLocale) MOZ_OVERRIDE;
nsACString& aLocale) override;
NS_IMETHOD GetStyleOverlays(nsIURI *aChromeURL,
nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
nsISimpleEnumerator **aResult) override;
NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL,
nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
nsISimpleEnumerator **aResult) override;
void RegisterPackage(const ChromePackage& aPackage);
void RegisterOverride(const OverrideMapping& aOverride);
@ -55,29 +55,29 @@ class nsChromeRegistryContent : public nsChromeRegistry
uint32_t flags;
};
nsresult UpdateSelectedLocale() MOZ_OVERRIDE;
nsresult UpdateSelectedLocale() override;
nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
const nsCString& aProvider,
const nsCString& aPath) MOZ_OVERRIDE;
nsresult GetFlagsFromPackage(const nsCString& aPackage, uint32_t* aFlags) MOZ_OVERRIDE;
const nsCString& aPath) override;
nsresult GetFlagsFromPackage(const nsCString& aPackage, uint32_t* aFlags) override;
nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
nsCString mLocale;
virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
char *const * argv, int flags) MOZ_OVERRIDE;
char *const * argv, int flags) override;
};
#endif // nsChromeRegistryContent_h

10
docshell/base/IHistory.h
View File

@ -131,14 +131,14 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
#define NS_DECL_IHISTORY \
NS_IMETHOD RegisterVisitedCallback(nsIURI* aURI, \
mozilla::dom::Link* aContent) MOZ_OVERRIDE; \
mozilla::dom::Link* aContent) override; \
NS_IMETHOD UnregisterVisitedCallback(nsIURI* aURI, \
mozilla::dom::Link* aContent) MOZ_OVERRIDE; \
mozilla::dom::Link* aContent) override; \
NS_IMETHOD VisitURI(nsIURI* aURI, \
nsIURI* aLastVisitedURI, \
uint32_t aFlags) MOZ_OVERRIDE; \
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) MOZ_OVERRIDE; \
NS_IMETHOD NotifyVisited(nsIURI* aURI) MOZ_OVERRIDE;
uint32_t aFlags) override; \
NS_IMETHOD SetURITitle(nsIURI* aURI, const nsAString& aTitle) override; \
NS_IMETHOD NotifyVisited(nsIURI* aURI) override;
} // namespace mozilla

2
docshell/base/LoadContext.h
View File

@ -31,7 +31,7 @@ namespace mozilla {
* to separate the safebrowsing cookie.
*/
class LoadContext MOZ_FINAL
class LoadContext final
: public nsILoadContext
, public nsIInterfaceRequestor
{

2
docshell/base/nsDSURIContentListener.h
View File

@ -16,7 +16,7 @@ class nsIWebNavigationInfo;
class nsIHttpChannel;
class nsAString;
class nsDSURIContentListener MOZ_FINAL
class nsDSURIContentListener final
: public nsIURIContentListener
, public nsSupportsWeakReference
{

6
docshell/base/nsDocShell.cpp
View File

@ -424,7 +424,7 @@ IsSameHost(nsIURI* aUri1, nsIURI* aUri2)
return host1.Equals(host2);
}
class nsPingListener MOZ_FINAL
class nsPingListener final
: public nsIStreamListener
, public nsIInterfaceRequestor
, public nsIChannelEventSink
@ -9379,7 +9379,7 @@ namespace {
#ifdef MOZ_PLACES
// Callback used by CopyFavicon to inform the favicon service that one URI
// (mNewURI) has the same favicon URI (OnComplete's aFaviconURI) as another.
class nsCopyFaviconCallback MOZ_FINAL : public nsIFaviconDataCallback
class nsCopyFaviconCallback final : public nsIFaviconDataCallback
{
public:
NS_DECL_ISUPPORTS
@ -9392,7 +9392,7 @@ public:
NS_IMETHODIMP
OnComplete(nsIURI* aFaviconURI, uint32_t aDataLen,
const uint8_t* aData, const nsACString& aMimeType) MOZ_OVERRIDE
const uint8_t* aData, const nsACString& aMimeType) override
{
// Continue only if there is an associated favicon.
if (!aFaviconURI) {

42
docshell/base/nsDocShell.h
View File

@ -135,7 +135,7 @@ enum eCharsetReloadState
//*** nsDocShell
//*****************************************************************************
class nsDocShell MOZ_FINAL
class nsDocShell final
: public nsDocLoader
, public nsIDocShell
, public nsIWebNavigation
@ -165,7 +165,7 @@ public:
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
virtual nsresult Init() MOZ_OVERRIDE;
virtual nsresult Init() override;
NS_DECL_ISUPPORTS_INHERITED
@ -187,7 +187,7 @@ public:
NS_DECL_NSINETWORKINTERCEPTCONTROLLER
NS_FORWARD_SAFE_NSIDOMSTORAGEMANAGER(TopSessionStorageManager())
NS_IMETHOD Stop() MOZ_OVERRIDE {
NS_IMETHOD Stop() override {
// Need this here because otherwise nsIWebNavigation::Stop
// overrides the docloader's Stop()
return nsDocLoader::Stop();
@ -204,7 +204,7 @@ public:
const nsAString& aFileName,
nsIInputStream* aPostDataStream,
nsIInputStream* aHeadersDataStream,
bool aIsTrusted) MOZ_OVERRIDE;
bool aIsTrusted) override;
NS_IMETHOD OnLinkClickSync(nsIContent* aContent,
nsIURI* aURI,
const char16_t* aTargetSpec,
@ -212,11 +212,11 @@ public:
nsIInputStream* aPostDataStream = 0,
nsIInputStream* aHeadersDataStream = 0,
nsIDocShell** aDocShell = 0,
nsIRequest** aRequest = 0) MOZ_OVERRIDE;
nsIRequest** aRequest = 0) override;
NS_IMETHOD OnOverLink(nsIContent* aContent,
nsIURI* aURI,
const char16_t* aTargetSpec) MOZ_OVERRIDE;
NS_IMETHOD OnLeaveLink() MOZ_OVERRIDE;
const char16_t* aTargetSpec) override;
NS_IMETHOD OnLeaveLink() override;
nsDocShellInfoLoadType ConvertLoadTypeToDocShellLoadInfo(uint32_t aLoadType);
uint32_t ConvertDocShellLoadInfoToLoadType(
@ -224,17 +224,17 @@ public:
// Don't use NS_DECL_NSILOADCONTEXT because some of nsILoadContext's methods
// are shared with nsIDocShell (appID, etc.) and can't be declared twice.
NS_IMETHOD GetAssociatedWindow(nsIDOMWindow**) MOZ_OVERRIDE;
NS_IMETHOD GetTopWindow(nsIDOMWindow**) MOZ_OVERRIDE;
NS_IMETHOD GetTopFrameElement(nsIDOMElement**) MOZ_OVERRIDE;
NS_IMETHOD GetNestedFrameId(uint64_t*) MOZ_OVERRIDE;
NS_IMETHOD IsAppOfType(uint32_t, bool*) MOZ_OVERRIDE;
NS_IMETHOD GetIsContent(bool*) MOZ_OVERRIDE;
NS_IMETHOD GetUsePrivateBrowsing(bool*) MOZ_OVERRIDE;
NS_IMETHOD SetUsePrivateBrowsing(bool) MOZ_OVERRIDE;
NS_IMETHOD SetPrivateBrowsing(bool) MOZ_OVERRIDE;
NS_IMETHOD GetUseRemoteTabs(bool*) MOZ_OVERRIDE;
NS_IMETHOD SetRemoteTabs(bool) MOZ_OVERRIDE;
NS_IMETHOD GetAssociatedWindow(nsIDOMWindow**) override;
NS_IMETHOD GetTopWindow(nsIDOMWindow**) override;
NS_IMETHOD GetTopFrameElement(nsIDOMElement**) override;
NS_IMETHOD GetNestedFrameId(uint64_t*) override;
NS_IMETHOD IsAppOfType(uint32_t, bool*) override;
NS_IMETHOD GetIsContent(bool*) override;
NS_IMETHOD GetUsePrivateBrowsing(bool*) override;
NS_IMETHOD SetUsePrivateBrowsing(bool) override;
NS_IMETHOD SetPrivateBrowsing(bool) override;
NS_IMETHOD GetUseRemoteTabs(bool*) override;
NS_IMETHOD SetRemoteTabs(bool) override;
// Restores a cached presentation from history (mLSHE).
// This method swaps out the content viewer and simulates loads for
@ -281,7 +281,7 @@ public:
protected:
// Object Management
virtual ~nsDocShell();
virtual void DestroyChildren() MOZ_OVERRIDE;
virtual void DestroyChildren() override;
// Content Viewer Management
nsresult EnsureContentViewer();
@ -456,7 +456,7 @@ protected:
virtual void OnRedirectStateChange(nsIChannel* aOldChannel,
nsIChannel* aNewChannel,
uint32_t aRedirectFlags,
uint32_t aStateFlags) MOZ_OVERRIDE;
uint32_t aStateFlags) override;
/**
* Helper function that determines if channel is an HTTP POST.
@ -691,7 +691,7 @@ protected:
int32_t aCurVerticalPos);
// Override the parent setter from nsDocLoader
virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) MOZ_OVERRIDE;
virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) override;
void ClearFrameHistory(nsISHEntry* aEntry);

2
docshell/base/nsDownloadHistory.h
View File

@ -13,7 +13,7 @@
#define NS_DOWNLOADHISTORY_CID \
{0x2ee83680, 0x2af0, 0x4bcb, {0xbf, 0xa0, 0xc9, 0x70, 0x5f, 0x65, 0x54, 0xf1}}
class nsDownloadHistory MOZ_FINAL : public nsIDownloadHistory
class nsDownloadHistory final : public nsIDownloadHistory
{
public:
NS_DECL_ISUPPORTS

4
docshell/base/nsIWebShellServices.h
View File

@ -32,7 +32,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIWebShellServices, NS_IWEB_SHELL_SERVICES_IID)
/* Use this macro when declaring classes that implement this interface. */
#define NS_DECL_NSIWEBSHELLSERVICES \
NS_IMETHOD ReloadDocument(const char* aCharset = nullptr, \
int32_t aSource = kCharsetUninitialized) MOZ_OVERRIDE; \
NS_IMETHOD StopDocumentLoad(void) MOZ_OVERRIDE;
int32_t aSource = kCharsetUninitialized) override; \
NS_IMETHOD StopDocumentLoad(void) override;
#endif /* nsIWebShellServices_h___ */

2
docshell/base/nsWebNavigationInfo.h
View File

@ -18,7 +18,7 @@ class nsCString;
#define NS_WEBNAVIGATION_INFO_CID \
{ 0xf30bc0a2, 0x958b, 0x4287,{0xbf, 0x62, 0xce, 0x38, 0xba, 0x0c, 0x81, 0x1e}}
class nsWebNavigationInfo MOZ_FINAL : public nsIWebNavigationInfo
class nsWebNavigationInfo final : public nsIWebNavigationInfo
{
public:
nsWebNavigationInfo() {}

2
docshell/shistory/src/nsSHEntry.h
View File

@ -22,7 +22,7 @@ class nsSHEntryShared;
class nsIInputStream;
class nsIURI;
class nsSHEntry MOZ_FINAL : public nsISHEntry,
class nsSHEntry final : public nsISHEntry,
public nsISHContainer,
public nsISHEntryInternal
{

Some files were not shown because too many files have changed in this diff Show More