Skip to content

Commit cbb8fde

Browse files
rocallahanrocallahan
committed
Bug 1015664. Part 1: Remove NS_HIDDEN_() usage. r=bsmedberg
1 parent c5f6316 commit cbb8fde

File tree

81 files changed

+464
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+464
-464
lines changed

‎browser/components/shell/src/nsGNOMEShellService.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class nsGNOMEShellService MOZ_FINAL : public nsIShellService
2323
private:
2424
~nsGNOMEShellService() {}
2525

26-
NS_HIDDEN_(bool) KeyMatchesAppName(const char *aKeyValue) const;
27-
NS_HIDDEN_(bool) CheckHandlerMatchesAppName(const nsACString& handler) const;
26+
bool KeyMatchesAppName(const char *aKeyValue) const;
27+
bool CheckHandlerMatchesAppName(const nsACString& handler) const;
2828

29-
NS_HIDDEN_(bool) GetAppPathFromLauncher();
29+
bool GetAppPathFromLauncher();
3030
bool mCheckedThisSession;
3131
bool mUseLocaleFilenames;
3232
nsCString mAppPath;

‎content/base/public/Element.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ class Element : public FragmentOrElement
949949
* @param aAttr name of attribute.
950950
* @param aValue Boolean value of attribute.
951951
*/
952-
NS_HIDDEN_(bool) GetBoolAttr(nsIAtom* aAttr) const
952+
bool GetBoolAttr(nsIAtom* aAttr) const
953953
{
954954
return HasAttr(kNameSpaceID_None, aAttr);
955955
}
@@ -962,7 +962,7 @@ class Element : public FragmentOrElement
962962
* @param aAttr name of attribute.
963963
* @param aValue Boolean value of attribute.
964964
*/
965-
NS_HIDDEN_(nsresult) SetBoolAttr(nsIAtom* aAttr, bool aValue);
965+
nsresult SetBoolAttr(nsIAtom* aAttr, bool aValue);
966966

967967
/**
968968
* Retrieve the ratio of font-size-inflated text font size to computed font

‎content/base/public/nsXMLNameSpaceMap.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,37 @@ class nsXMLNameSpaceMap
3131
* Allocates a new nsXMLNameSpaceMap (with new()) and if aForXML is
3232
* true initializes it with the xmlns and xml namespaces.
3333
*/
34-
static NS_HIDDEN_(nsXMLNameSpaceMap*) Create(bool aForXML);
34+
static nsXMLNameSpaceMap* Create(bool aForXML);
3535

3636
/**
3737
* Add a prefix and its corresponding namespace ID to the map.
3838
* Passing a null |aPrefix| corresponds to the default namespace, which may
3939
* be set to something other than kNameSpaceID_None.
4040
*/
41-
NS_HIDDEN_(nsresult) AddPrefix(nsIAtom *aPrefix, int32_t aNameSpaceID);
41+
nsresult AddPrefix(nsIAtom *aPrefix, int32_t aNameSpaceID);
4242

4343
/**
4444
* Add a prefix and a namespace URI to the map. The URI will be converted
4545
* to its corresponding namespace ID.
4646
*/
47-
NS_HIDDEN_(nsresult) AddPrefix(nsIAtom *aPrefix, nsString &aURI);
47+
nsresult AddPrefix(nsIAtom *aPrefix, nsString &aURI);
4848

4949
/*
5050
* Returns the namespace ID for the given prefix, if it is in the map.
5151
* If |aPrefix| is null and is not in the map, then a null namespace
5252
* (kNameSpaceID_None) is returned. If |aPrefix| is non-null and is not in
5353
* the map, then kNameSpaceID_Unknown is returned.
5454
*/
55-
NS_HIDDEN_(int32_t) FindNameSpaceID(nsIAtom *aPrefix) const;
55+
int32_t FindNameSpaceID(nsIAtom *aPrefix) const;
5656

5757
/**
5858
* If the given namespace ID is in the map, then the first prefix which
5959
* maps to that namespace is returned. Otherwise, null is returned.
6060
*/
61-
NS_HIDDEN_(nsIAtom*) FindPrefix(int32_t aNameSpaceID) const;
61+
nsIAtom* FindPrefix(int32_t aNameSpaceID) const;
6262

6363
/* Removes all prefix mappings. */
64-
NS_HIDDEN_(void) Clear();
64+
void Clear();
6565

6666
~nsXMLNameSpaceMap() { Clear(); }
6767

‎content/base/src/nsContentList.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ class nsContentList : public nsBaseContentList,
284284
nsTArray<nsString>& aNames) MOZ_OVERRIDE;
285285

286286
// nsContentList public methods
287-
NS_HIDDEN_(uint32_t) Length(bool aDoFlush);
288-
NS_HIDDEN_(nsIContent*) Item(uint32_t aIndex, bool aDoFlush);
289-
NS_HIDDEN_(mozilla::dom::Element*)
287+
uint32_t Length(bool aDoFlush);
288+
nsIContent* Item(uint32_t aIndex, bool aDoFlush);
289+
mozilla::dom::Element*
290290
NamedItem(const nsAString& aName, bool aDoFlush);
291291

292292
// nsIMutationObserver

‎content/base/src/nsContentSink.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ class nsContentSink : public nsICSSLoaderObserver,
9292
virtual nsresult ProcessMETATag(nsIContent* aContent);
9393

9494
// nsIContentSink implementation helpers
95-
NS_HIDDEN_(nsresult) WillParseImpl(void);
96-
NS_HIDDEN_(nsresult) WillInterruptImpl(void);
97-
NS_HIDDEN_(nsresult) WillResumeImpl(void);
98-
NS_HIDDEN_(nsresult) DidProcessATokenImpl(void);
99-
NS_HIDDEN_(void) WillBuildModelImpl(void);
100-
NS_HIDDEN_(void) DidBuildModelImpl(bool aTerminated);
101-
NS_HIDDEN_(void) DropParserAndPerfHint(void);
95+
nsresult WillParseImpl(void);
96+
nsresult WillInterruptImpl(void);
97+
nsresult WillResumeImpl(void);
98+
nsresult DidProcessATokenImpl(void);
99+
void WillBuildModelImpl(void);
100+
void DidBuildModelImpl(bool aTerminated);
101+
void DropParserAndPerfHint(void);
102102
bool IsScriptExecutingImpl();
103103

104104
void NotifyAppend(nsIContent* aContent, uint32_t aStartIndex);

‎content/base/src/nsDocument.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -969,53 +969,53 @@ class nsDocument : public nsIDocument,
969969
int32_t aNamespaceID,
970970
nsIContent **aResult) MOZ_OVERRIDE;
971971

972-
virtual NS_HIDDEN_(void) Sanitize();
972+
virtual void Sanitize();
973973

974-
virtual NS_HIDDEN_(void) EnumerateSubDocuments(nsSubDocEnumFunc aCallback,
974+
virtual void EnumerateSubDocuments(nsSubDocEnumFunc aCallback,
975975
void *aData);
976976

977-
virtual NS_HIDDEN_(bool) CanSavePresentation(nsIRequest *aNewRequest);
978-
virtual NS_HIDDEN_(void) Destroy();
979-
virtual NS_HIDDEN_(void) RemovedFromDocShell();
980-
virtual NS_HIDDEN_(already_AddRefed<nsILayoutHistoryState>) GetLayoutHistoryState() const;
977+
virtual bool CanSavePresentation(nsIRequest *aNewRequest);
978+
virtual void Destroy();
979+
virtual void RemovedFromDocShell();
980+
virtual already_AddRefed<nsILayoutHistoryState> GetLayoutHistoryState() const;
981981

982-
virtual NS_HIDDEN_(void) BlockOnload();
983-
virtual NS_HIDDEN_(void) UnblockOnload(bool aFireSync);
982+
virtual void BlockOnload();
983+
virtual void UnblockOnload(bool aFireSync);
984984

985-
virtual NS_HIDDEN_(void) AddStyleRelevantLink(mozilla::dom::Link* aLink);
986-
virtual NS_HIDDEN_(void) ForgetLink(mozilla::dom::Link* aLink);
985+
virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink);
986+
virtual void ForgetLink(mozilla::dom::Link* aLink);
987987

988-
NS_HIDDEN_(void) ClearBoxObjectFor(nsIContent* aContent);
988+
void ClearBoxObjectFor(nsIContent* aContent);
989989
already_AddRefed<nsIBoxObject> GetBoxObjectFor(mozilla::dom::Element* aElement,
990990
mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
991991

992-
virtual NS_HIDDEN_(Element*)
992+
virtual Element*
993993
GetAnonymousElementByAttribute(nsIContent* aElement,
994994
nsIAtom* aAttrName,
995995
const nsAString& aAttrValue) const;
996996

997-
virtual NS_HIDDEN_(Element*) ElementFromPointHelper(float aX, float aY,
997+
virtual Element* ElementFromPointHelper(float aX, float aY,
998998
bool aIgnoreRootScrollFrame,
999999
bool aFlushLayout);
10001000

1001-
virtual NS_HIDDEN_(nsresult) NodesFromRectHelper(float aX, float aY,
1001+
virtual nsresult NodesFromRectHelper(float aX, float aY,
10021002
float aTopSize, float aRightSize,
10031003
float aBottomSize, float aLeftSize,
10041004
bool aIgnoreRootScrollFrame,
10051005
bool aFlushLayout,
10061006
nsIDOMNodeList** aReturn);
10071007

1008-
virtual NS_HIDDEN_(void) FlushSkinBindings();
1008+
virtual void FlushSkinBindings();
10091009

1010-
virtual NS_HIDDEN_(nsresult) InitializeFrameLoader(nsFrameLoader* aLoader);
1011-
virtual NS_HIDDEN_(nsresult) FinalizeFrameLoader(nsFrameLoader* aLoader);
1012-
virtual NS_HIDDEN_(void) TryCancelFrameLoaderInitialization(nsIDocShell* aShell);
1013-
virtual NS_HIDDEN_(bool) FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell);
1014-
virtual NS_HIDDEN_(nsIDocument*)
1010+
virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader);
1011+
virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader);
1012+
virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell);
1013+
virtual bool FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell);
1014+
virtual nsIDocument*
10151015
RequestExternalResource(nsIURI* aURI,
10161016
nsINode* aRequestingNode,
10171017
ExternalResourceLoad** aPendingLoad);
1018-
virtual NS_HIDDEN_(void)
1018+
virtual void
10191019
EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData);
10201020

10211021
nsTArray<nsCString> mHostObjectURIs;
@@ -1099,9 +1099,9 @@ class nsDocument : public nsIDocument,
10991099
virtual void MozSetImageElement(const nsAString& aImageElementId,
11001100
Element* aElement) MOZ_OVERRIDE;
11011101

1102-
virtual NS_HIDDEN_(nsresult) AddImage(imgIRequest* aImage);
1103-
virtual NS_HIDDEN_(nsresult) RemoveImage(imgIRequest* aImage, uint32_t aFlags);
1104-
virtual NS_HIDDEN_(nsresult) SetImageLockingState(bool aLocked);
1102+
virtual nsresult AddImage(imgIRequest* aImage);
1103+
virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags);
1104+
virtual nsresult SetImageLockingState(bool aLocked);
11051105

11061106
// AddPlugin adds a plugin-related element to mPlugins when the element is
11071107
// added to the tree.

‎content/base/src/nsFrameLoader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class nsFrameLoader MOZ_FINAL : public nsIFrameLoader,
174174
NS_DECL_NSIFRAMELOADER
175175
NS_DECL_NSICONTENTVIEWMANAGER
176176
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
177-
NS_HIDDEN_(nsresult) CheckForRecursiveLoad(nsIURI* aURI);
177+
nsresult CheckForRecursiveLoad(nsIURI* aURI);
178178
nsresult ReallyStartLoading();
179179
void Finalize();
180180
nsIDocShell* GetExistingDocShell() { return mDocShell; }
@@ -372,7 +372,7 @@ class nsFrameLoader MOZ_FINAL : public nsIFrameLoader,
372372

373373
// Updates the subdocument position and size. This gets called only
374374
// when we have our own in-process DocShell.
375-
NS_HIDDEN_(nsresult) UpdateBaseWindowPositionAndSize(nsSubDocumentFrame *aIFrame);
375+
nsresult UpdateBaseWindowPositionAndSize(nsSubDocumentFrame *aIFrame);
376376
nsresult CheckURILoad(nsIURI* aURI);
377377
void FireErrorEvent();
378378
nsresult ReallyStartLoadingInternal();

‎content/base/src/nsPropertyTable.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class nsPropertyTable::PropertyList {
4545

4646
// Removes the property associated with the given object, and destroys
4747
// the property value
48-
NS_HIDDEN_(bool) DeletePropertyFor(nsPropertyOwner aObject);
48+
bool DeletePropertyFor(nsPropertyOwner aObject);
4949

5050
// Destroy all remaining properties (without removing them)
51-
NS_HIDDEN_(void) Destroy();
51+
void Destroy();
5252

53-
NS_HIDDEN_(bool) Equals(nsIAtom *aPropertyName)
53+
bool Equals(nsIAtom *aPropertyName)
5454
{
5555
return mName == aPropertyName;
5656
}

‎content/base/src/nsPropertyTable.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class nsPropertyTable
9393
* table changes too). If |aTransfer| is false the property will just be
9494
* deleted instead.
9595
*/
96-
NS_HIDDEN_(nsresult) SetProperty(nsPropertyOwner aObject,
96+
nsresult SetProperty(nsPropertyOwner aObject,
9797
nsIAtom *aPropertyName,
9898
void *aPropertyValue,
9999
NSPropertyDtorFunc aDtor,
@@ -109,7 +109,7 @@ class nsPropertyTable
109109
* Delete the property |aPropertyName| in the global category for object
110110
* |aObject|. The property's destructor function will be called.
111111
*/
112-
NS_HIDDEN_(nsresult) DeleteProperty(nsPropertyOwner aObject,
112+
nsresult DeleteProperty(nsPropertyOwner aObject,
113113
nsIAtom *aPropertyName);
114114

115115
/**
@@ -128,7 +128,7 @@ class nsPropertyTable
128128
* Deletes all of the properties for object |aObject|, calling the
129129
* destructor function for each property.
130130
*/
131-
NS_HIDDEN_(void) DeleteAllPropertiesFor(nsPropertyOwner aObject);
131+
void DeleteAllPropertiesFor(nsPropertyOwner aObject);
132132

133133
/**
134134
* Transfers all properties for object |aObject| that were set with the
@@ -137,7 +137,7 @@ class nsPropertyTable
137137
* If transfering a property fails, this deletes all the properties for
138138
* object |aObject|.
139139
*/
140-
NS_HIDDEN_(nsresult)
140+
nsresult
141141
TransferOrDeleteAllPropertiesFor(nsPropertyOwner aObject,
142142
nsPropertyTable *aOtherTable);
143143

@@ -146,21 +146,21 @@ class nsPropertyTable
146146
* For every property |aCallback| will be called with as arguments |aObject|,
147147
* the property name, the property value and |aData|.
148148
*/
149-
NS_HIDDEN_(void) Enumerate(nsPropertyOwner aObject,
149+
void Enumerate(nsPropertyOwner aObject,
150150
NSPropertyFunc aCallback, void *aData);
151151

152152
/**
153153
* Enumerate all the properties.
154154
* For every property |aCallback| will be called with arguments the owner,
155155
* the property name, the property value and |aData|.
156156
*/
157-
NS_HIDDEN_(void) EnumerateAll(NSPropertyFunc aCallback, void *aData);
157+
void EnumerateAll(NSPropertyFunc aCallback, void *aData);
158158

159159
/**
160160
* Deletes all of the properties for all objects in the property
161161
* table, calling the destructor function for each property.
162162
*/
163-
NS_HIDDEN_(void) DeleteAllProperties();
163+
void DeleteAllProperties();
164164

165165
nsPropertyTable() : mPropertyList(nullptr) {}
166166
~nsPropertyTable() {
@@ -181,13 +181,13 @@ class nsPropertyTable
181181
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
182182

183183
private:
184-
NS_HIDDEN_(void) DestroyPropertyList();
185-
NS_HIDDEN_(PropertyList*) GetPropertyListFor(nsIAtom *aPropertyName) const;
186-
NS_HIDDEN_(void*) GetPropertyInternal(nsPropertyOwner aObject,
184+
void DestroyPropertyList();
185+
PropertyList* GetPropertyListFor(nsIAtom *aPropertyName) const;
186+
void* GetPropertyInternal(nsPropertyOwner aObject,
187187
nsIAtom *aPropertyName,
188188
bool aRemove,
189189
nsresult *aStatus);
190-
NS_HIDDEN_(nsresult) SetPropertyInternal(nsPropertyOwner aObject,
190+
nsresult SetPropertyInternal(nsPropertyOwner aObject,
191191
nsIAtom *aPropertyName,
192192
void *aPropertyValue,
193193
NSPropertyDtorFunc aDtor,

‎content/html/content/src/HTMLInputElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID);
119119

120120
// This must come outside of any namespace, or else it won't overload with the
121121
// double based version in nsMathUtils.h
122-
inline NS_HIDDEN_(mozilla::Decimal)
122+
inline mozilla::Decimal
123123
NS_floorModulo(mozilla::Decimal x, mozilla::Decimal y)
124124
{
125125
return (x - y * (x / y).floor());

‎content/html/content/src/HTMLObjectElement.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class HTMLObjectElement MOZ_FINAL : public nsGenericHTMLFormElement
225225
/**
226226
* Calls LoadObject with the correct arguments to start the plugin load.
227227
*/
228-
NS_HIDDEN_(void) StartObjectLoad(bool aNotify);
228+
void StartObjectLoad(bool aNotify);
229229

230230
/**
231231
* Returns if the element is currently focusable regardless of it's tabindex

‎content/html/content/src/HTMLSharedObjectElement.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class HTMLSharedObjectElement MOZ_FINAL : public nsGenericHTMLElement
192192
/**
193193
* Calls LoadObject with the correct arguments to start the plugin load.
194194
*/
195-
NS_HIDDEN_(void) StartObjectLoad(bool aNotify);
195+
void StartObjectLoad(bool aNotify);
196196

197197
nsIAtom *URIAttrName() const
198198
{

0 commit comments

Comments
 (0)