From 2f0d01a21280a8655e90c8b7475b43b51a284aee Mon Sep 17 00:00:00 2001 From: Tokio Kajitsuka Date: Wed, 16 May 2018 01:31:09 +0900 Subject: [PATCH] Bug 1438193 - part11-5: nsTextEquivUtils r=surkov turn nsTextEquivUtils functions into const --- accessible/base/nsTextEquivUtils.cpp | 10 +++++----- accessible/base/nsTextEquivUtils.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/accessible/base/nsTextEquivUtils.cpp b/accessible/base/nsTextEquivUtils.cpp index d37872600840..b072d0692c0f 100644 --- a/accessible/base/nsTextEquivUtils.cpp +++ b/accessible/base/nsTextEquivUtils.cpp @@ -21,13 +21,13 @@ using namespace mozilla::a11y; * for bailing out during recursive text computation, or for special cases * like step f. of the ARIA implementation guide. */ -static Accessible* sInitiatorAcc = nullptr; +static const Accessible* sInitiatorAcc = nullptr; //////////////////////////////////////////////////////////////////////////////// // nsTextEquivUtils. Public. nsresult -nsTextEquivUtils::GetNameFromSubtree(Accessible* aAccessible, +nsTextEquivUtils::GetNameFromSubtree(const Accessible* aAccessible, nsAString& aName) { aName.Truncate(); @@ -53,7 +53,7 @@ nsTextEquivUtils::GetNameFromSubtree(Accessible* aAccessible, } nsresult -nsTextEquivUtils::GetTextEquivFromIDRefs(Accessible* aAccessible, +nsTextEquivUtils::GetTextEquivFromIDRefs(const Accessible* aAccessible, nsAtom *aIDRefsAttr, nsAString& aTextEquiv) { @@ -78,7 +78,7 @@ nsTextEquivUtils::GetTextEquivFromIDRefs(Accessible* aAccessible, } nsresult -nsTextEquivUtils::AppendTextEquivFromContent(Accessible* aInitiatorAcc, +nsTextEquivUtils::AppendTextEquivFromContent(const Accessible* aInitiatorAcc, nsIContent *aContent, nsAString *aString) { @@ -170,7 +170,7 @@ nsTextEquivUtils::AppendTextEquivFromTextContent(nsIContent *aContent, // nsTextEquivUtils. Private. nsresult -nsTextEquivUtils::AppendFromAccessibleChildren(Accessible* aAccessible, +nsTextEquivUtils::AppendFromAccessibleChildren(const Accessible* aAccessible, nsAString *aString) { nsresult rv = NS_OK_NO_NAME_CLAUSE_HANDLED; diff --git a/accessible/base/nsTextEquivUtils.h b/accessible/base/nsTextEquivUtils.h index 26e80d04cd2e..db902e0c0003 100644 --- a/accessible/base/nsTextEquivUtils.h +++ b/accessible/base/nsTextEquivUtils.h @@ -61,14 +61,14 @@ public: * @param aAccessible [in] the given accessible * @param aName [out] accessible name */ - static nsresult GetNameFromSubtree(Accessible* aAccessible, + static nsresult GetNameFromSubtree(const Accessible* aAccessible, nsAString& aName); /** * Calculates text equivalent from the subtree. Similar to GetNameFromSubtree. * However it returns not empty result for things like HTML p. */ - static void GetTextEquivFromSubtree(Accessible* aAccessible, + static void GetTextEquivFromSubtree(const Accessible* aAccessible, nsString& aTextEquiv) { aTextEquiv.Truncate(); @@ -85,7 +85,7 @@ public: * @param aIDRefsAttr [in] IDRefs attribute on DOM node of the accessible * @param aTextEquiv [out] result text equivalent */ - static nsresult GetTextEquivFromIDRefs(Accessible* aAccessible, + static nsresult GetTextEquivFromIDRefs(const Accessible* aAccessible, nsAtom *aIDRefsAttr, nsAString& aTextEquiv); @@ -100,7 +100,7 @@ public: * computed from * @param aString [in, out] the string */ - static nsresult AppendTextEquivFromContent(Accessible* aInitiatorAcc, + static nsresult AppendTextEquivFromContent(const Accessible* aInitiatorAcc, nsIContent *aContent, nsAString *aString); @@ -119,7 +119,7 @@ private: * Iterates accessible children and calculates text equivalent from each * child. */ - static nsresult AppendFromAccessibleChildren(Accessible* aAccessible, + static nsresult AppendFromAccessibleChildren(const Accessible* aAccessible, nsAString *aString); /**