nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1438193 - part11-2: RelationByType r=surkov

Browse source 
turn RelationByType into const functions
This commit is contained in:
Tokio Kajitsuka 2018-05-15 22:47:10 +09:00
parent 17d2e291d4
commit 41078f48d3
25 changed files with 44 additions and 44 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
accessible/base/AccIterator.h
View file

@ -279,7 +279,7 @@ private:
class ItemIterator : public AccIterable class ItemIterator : public AccIterable
{ {
public: public:
explicit ItemIterator(Accessible* aItemContainer) : explicit ItemIterator(const Accessible* aItemContainer) :
mContainer(aItemContainer), mAnchor(nullptr) { } mContainer(aItemContainer), mAnchor(nullptr) { }
virtual ~ItemIterator() { } virtual ~ItemIterator() { }
@ -290,7 +290,7 @@ private:
ItemIterator(const ItemIterator&) = delete; ItemIterator(const ItemIterator&) = delete;
ItemIterator& operator = (const ItemIterator&) = delete; ItemIterator& operator = (const ItemIterator&) = delete;
Accessible* mContainer; const Accessible* mContainer;
Accessible* mAnchor; Accessible* mAnchor;
}; };

4
accessible/generic/Accessible.cpp
View file

@ -1627,7 +1627,7 @@ Accessible::GetAtomicRegion() const
} }
Relation Relation
Accessible::RelationByType(RelationType aType) Accessible::RelationByType(RelationType aType) const
{ {
if (!HasOwnContent()) if (!HasOwnContent())
return Relation(); return Relation();
@ -2733,7 +2733,7 @@ Accessible::GetActionRule() const
} }
AccGroupInfo* AccGroupInfo*
Accessible::GetGroupInfo() Accessible::GetGroupInfo() const
{ {
if (IsProxy()) if (IsProxy())
MOZ_CRASH("This should never be called on proxy wrappers"); MOZ_CRASH("This should never be called on proxy wrappers");

8
accessible/generic/Accessible.h
View file

@ -367,7 +367,7 @@ public:
/** /**
* Get the relation of the given type. * Get the relation of the given type.
*/ */
virtual Relation RelationByType(RelationType aType); virtual Relation RelationByType(RelationType aType) const;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Initializing methods // Initializing methods
@ -1131,7 +1131,7 @@ protected:
/** /**
* Return group info. * Return group info.
*/ */
AccGroupInfo* GetGroupInfo(); AccGroupInfo* GetGroupInfo() const;
// Data Members // Data Members
nsCOMPtr<nsIContent> mContent; nsCOMPtr<nsIContent> mContent;
@ -1155,7 +1155,7 @@ protected:
/** /**
* Keep in sync with StateFlags, ContextFlags, and AccTypes. * Keep in sync with StateFlags, ContextFlags, and AccTypes.
*/ */
uint32_t mStateFlags : kStateFlagsBits; mutable uint32_t mStateFlags : kStateFlagsBits;
uint32_t mContextFlags : kContextFlagsBits; uint32_t mContextFlags : kContextFlagsBits;
uint32_t mType : kTypeBits; uint32_t mType : kTypeBits;
uint32_t mGenericTypes : kGenericTypesBits; uint32_t mGenericTypes : kGenericTypesBits;
@ -1187,7 +1187,7 @@ protected:
{ {
AccGroupInfo* groupInfo; AccGroupInfo* groupInfo;
ProxyAccessible* proxy; ProxyAccessible* proxy;
} mBits; } mutable mBits;
friend class AccGroupInfo; friend class AccGroupInfo;
private: private:

2
accessible/generic/ApplicationAccessible.cpp
View file

@ -110,7 +110,7 @@ ApplicationAccessible::FocusedChild()
} }
Relation Relation
ApplicationAccessible::RelationByType(RelationType aRelationType) ApplicationAccessible::RelationByType(RelationType aRelationType) const
{ {
return Relation(); return Relation();
} }

2
accessible/generic/ApplicationAccessible.h
View file

@ -47,7 +47,7 @@ public:
virtual mozilla::a11y::role NativeRole() const override; virtual mozilla::a11y::role NativeRole() const override;
virtual uint64_t State() override; virtual uint64_t State() override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY, virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
EWhichChildAtPoint aWhichChild) override; EWhichChildAtPoint aWhichChild) override;

2
accessible/generic/HyperTextAccessible.cpp
View file

@ -1922,7 +1922,7 @@ HyperTextAccessible::InsertChildAt(uint32_t aIndex, Accessible* aChild)
} }
Relation Relation
HyperTextAccessible::RelationByType(RelationType aType) HyperTextAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = Accessible::RelationByType(aType); Relation rel = Accessible::RelationByType(aType);

2
accessible/generic/HyperTextAccessible.h
View file

@ -63,7 +63,7 @@ public:
virtual void Shutdown() override; virtual void Shutdown() override;
virtual bool RemoveChild(Accessible* aAccessible) override; virtual bool RemoveChild(Accessible* aAccessible) override;
virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override; virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
// HyperTextAccessible (static helper method) // HyperTextAccessible (static helper method)

2
accessible/generic/RootAccessible.cpp
View file

@ -480,7 +480,7 @@ RootAccessible::Shutdown()
} }
Relation Relation
RootAccessible::RelationByType(RelationType aType) RootAccessible::RelationByType(RelationType aType) const
{ {
if (!mDocumentNode || aType != RelationType::EMBEDS) if (!mDocumentNode || aType != RelationType::EMBEDS)
return DocAccessibleWrap::RelationByType(aType); return DocAccessibleWrap::RelationByType(aType);

2
accessible/generic/RootAccessible.h
View file

@ -30,7 +30,7 @@ public:
// Accessible // Accessible
virtual void Shutdown() override; virtual void Shutdown() override;
virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override; virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
virtual mozilla::a11y::role NativeRole() const override; virtual mozilla::a11y::role NativeRole() const override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;

4
accessible/html/HTMLElementAccessibles.cpp
View file

@ -64,7 +64,7 @@ HTMLLabelAccessible::NativeName(nsString& aName)
} }
Relation Relation
HTMLLabelAccessible::RelationByType(RelationType aType) HTMLLabelAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType == RelationType::LABEL_FOR) { if (aType == RelationType::LABEL_FOR) {
@ -106,7 +106,7 @@ HTMLLabelAccessible::DoAction(uint8_t aIndex)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Relation Relation
HTMLOutputAccessible::RelationByType(RelationType aType) HTMLOutputAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType == RelationType::CONTROLLED_BY) if (aType == RelationType::CONTROLLED_BY)

4
accessible/html/HTMLElementAccessibles.h
View file

@ -61,7 +61,7 @@ public:
HyperTextAccessibleWrap) HyperTextAccessibleWrap)
// Accessible // Accessible
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
// ActionAccessible // ActionAccessible
virtual uint8_t ActionCount() override; virtual uint8_t ActionCount() override;
@ -87,7 +87,7 @@ public:
HyperTextAccessibleWrap) HyperTextAccessibleWrap)
// Accessible // Accessible
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
protected: protected:
virtual ~HTMLOutputAccessible() {} virtual ~HTMLOutputAccessible() {}

8
accessible/html/HTMLFormControlAccessible.cpp
View file

@ -734,7 +734,7 @@ HTMLGroupboxAccessible::NativeName(nsString& aName)
} }
Relation Relation
HTMLGroupboxAccessible::RelationByType(RelationType aType) HTMLGroupboxAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
// No override for label, so use <legend> for this <fieldset> // No override for label, so use <legend> for this <fieldset>
@ -755,7 +755,7 @@ HTMLLegendAccessible::
} }
Relation Relation
HTMLLegendAccessible::RelationByType(RelationType aType) HTMLLegendAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType != RelationType::LABEL_FOR) if (aType != RelationType::LABEL_FOR)
@ -793,7 +793,7 @@ HTMLFigureAccessible::NativeName(nsString& aName)
} }
Relation Relation
HTMLFigureAccessible::RelationByType(RelationType aType) HTMLFigureAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType == RelationType::LABELLED_BY) if (aType == RelationType::LABELLED_BY)
@ -827,7 +827,7 @@ HTMLFigcaptionAccessible::
} }
Relation Relation
HTMLFigcaptionAccessible::RelationByType(RelationType aType) HTMLFigcaptionAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType != RelationType::LABEL_FOR) if (aType != RelationType::LABEL_FOR)

8
accessible/html/HTMLFormControlAccessible.h
View file

@ -225,7 +225,7 @@ public:
// Accessible // Accessible
virtual mozilla::a11y::role NativeRole() const override; virtual mozilla::a11y::role NativeRole() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
protected: protected:
// Accessible // Accessible
@ -245,7 +245,7 @@ public:
HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible // Accessible
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
}; };
/** /**
@ -257,7 +257,7 @@ public:
HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible // Accessible
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
protected: protected:
// Accessible // Accessible
@ -277,7 +277,7 @@ public:
HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc); HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible // Accessible
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
}; };
} // namespace a11y } // namespace a11y

4
accessible/html/HTMLTableAccessible.cpp
View file

@ -455,7 +455,7 @@ HTMLTableAccessible::NativeAttributes()
// HTMLTableAccessible: Accessible // HTMLTableAccessible: Accessible
Relation Relation
HTMLTableAccessible::RelationByType(RelationType aType) HTMLTableAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType == RelationType::LABELLED_BY) if (aType == RelationType::LABELLED_BY)
@ -1104,7 +1104,7 @@ HTMLTableAccessible::IsProbablyLayoutTable()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Relation Relation
HTMLCaptionAccessible::RelationByType(RelationType aType) HTMLCaptionAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessible::RelationByType(aType); Relation rel = HyperTextAccessible::RelationByType(aType);
if (aType == RelationType::LABEL_FOR) if (aType == RelationType::LABEL_FOR)

4
accessible/html/HTMLTableAccessible.h
View file

@ -165,7 +165,7 @@ public:
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override; virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual Relation RelationByType(RelationType aRelationType) override; virtual Relation RelationByType(RelationType aRelationType) const override;
virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override; virtual bool InsertChildAt(uint32_t aIndex, Accessible* aChild) override;
@ -224,7 +224,7 @@ public:
// Accessible // Accessible
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual Relation RelationByType(RelationType aRelationType) override; virtual Relation RelationByType(RelationType aRelationType) const override;
protected: protected:
virtual ~HTMLCaptionAccessible() { } virtual ~HTMLCaptionAccessible() { }

2
accessible/xul/XULElementAccessibles.cpp
View file

@ -87,7 +87,7 @@ XULLabelAccessible::NativeState()
} }
Relation Relation
XULLabelAccessible::RelationByType(RelationType aType) XULLabelAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = HyperTextAccessibleWrap::RelationByType(aType); Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
if (aType == RelationType::LABEL_FOR) { if (aType == RelationType::LABEL_FOR) {

2
accessible/xul/XULElementAccessibles.h
View file

@ -26,7 +26,7 @@ public:
virtual void Shutdown() override; virtual void Shutdown() override;
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
void UpdateLabelValue(const nsString& aValue); void UpdateLabelValue(const nsString& aValue);

2
accessible/xul/XULFormControlAccessible.cpp
View file

@ -370,7 +370,7 @@ XULGroupboxAccessible::NativeName(nsString& aName)
} }
Relation Relation
XULGroupboxAccessible::RelationByType(RelationType aType) XULGroupboxAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType != RelationType::LABELLED_BY) if (aType != RelationType::LABELLED_BY)

2
accessible/xul/XULFormControlAccessible.h
View file

@ -111,7 +111,7 @@ public:
// Accessible // Accessible
virtual mozilla::a11y::role NativeRole() const override; virtual mozilla::a11y::role NativeRole() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
protected: protected:
// Accessible // Accessible

4
accessible/xul/XULTabAccessible.cpp
View file

@ -102,7 +102,7 @@ XULTabAccessible::NativeInteractiveState() const
} }
Relation Relation
XULTabAccessible::RelationByType(RelationType aType) XULTabAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType != RelationType::LABEL_FOR) if (aType != RelationType::LABEL_FOR)
@ -189,7 +189,7 @@ XULTabpanelAccessible::NativeRole() const
} }
Relation Relation
XULTabpanelAccessible::RelationByType(RelationType aType) XULTabpanelAccessible::RelationByType(RelationType aType) const
{ {
Relation rel = AccessibleWrap::RelationByType(aType); Relation rel = AccessibleWrap::RelationByType(aType);
if (aType != RelationType::LABELLED_BY) if (aType != RelationType::LABELLED_BY)

4
accessible/xul/XULTabAccessible.h
View file

@ -28,7 +28,7 @@ public:
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override; virtual uint64_t NativeInteractiveState() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
// ActionAccessible // ActionAccessible
virtual uint8_t ActionCount() override; virtual uint8_t ActionCount() override;
@ -87,7 +87,7 @@ public:
// Accessible // Accessible
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
}; };
} // namespace a11y } // namespace a11y

4
accessible/xul/XULTreeAccessible.cpp
View file

@ -433,7 +433,7 @@ XULTreeAccessible::ChildCount() const
} }
Relation Relation
XULTreeAccessible::RelationByType(RelationType aType) XULTreeAccessible::RelationByType(RelationType aType) const
{ {
if (aType == RelationType::NODE_PARENT_OF) { if (aType == RelationType::NODE_PARENT_OF) {
if (mTreeView) if (mTreeView)
@ -790,7 +790,7 @@ XULTreeItemAccessibleBase::TakeFocus()
} }
Relation Relation
XULTreeItemAccessibleBase::RelationByType(RelationType aType) XULTreeItemAccessibleBase::RelationByType(RelationType aType) const
{ {
switch (aType) { switch (aType) {

4
accessible/xul/XULTreeAccessible.h
View file

@ -48,7 +48,7 @@ public:
virtual Accessible* GetChildAt(uint32_t aIndex) const override; virtual Accessible* GetChildAt(uint32_t aIndex) const override;
virtual uint32_t ChildCount() const override; virtual uint32_t ChildCount() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
// SelectAccessible // SelectAccessible
virtual void SelectedItems(nsTArray<Accessible*>* aItems) override; virtual void SelectedItems(nsTArray<Accessible*>* aItems) override;
@ -152,7 +152,7 @@ public:
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override; virtual uint64_t NativeInteractiveState() const override;
virtual int32_t IndexInParent() const override; virtual int32_t IndexInParent() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
virtual Accessible* FocusedChild() override; virtual Accessible* FocusedChild() override;
virtual void SetSelected(bool aSelect) override; virtual void SetSelected(bool aSelect) override;
virtual void TakeFocus() override; virtual void TakeFocus() override;

2
accessible/xul/XULTreeGridAccessible.cpp
View file

@ -732,7 +732,7 @@ XULTreeGridCellAccessible::IndexInParent() const
} }
Relation Relation
XULTreeGridCellAccessible::RelationByType(RelationType aType) XULTreeGridCellAccessible::RelationByType(RelationType aType) const
{ {
return Relation(); return Relation();
} }

2
accessible/xul/XULTreeGridAccessible.h
View file

@ -132,7 +132,7 @@ public:
virtual Accessible* FocusedChild() override; virtual Accessible* FocusedChild() override;
virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override; virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() override;
virtual int32_t IndexInParent() const override; virtual int32_t IndexInParent() const override;
virtual Relation RelationByType(RelationType aType) override; virtual Relation RelationByType(RelationType aType) const override;
virtual a11y::role NativeRole() const override; virtual a11y::role NativeRole() const override;
virtual uint64_t NativeState() override; virtual uint64_t NativeState() override;
virtual uint64_t NativeInteractiveState() const override; virtual uint64_t NativeInteractiveState() const override;