diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/src/nsGNOMEShellService.h index 6a4e21dd141..a676f56b96b 100644 --- a/browser/components/shell/src/nsGNOMEShellService.h +++ b/browser/components/shell/src/nsGNOMEShellService.h @@ -23,10 +23,10 @@ public: private: ~nsGNOMEShellService() {} - NS_HIDDEN_(bool) KeyMatchesAppName(const char *aKeyValue) const; - NS_HIDDEN_(bool) CheckHandlerMatchesAppName(const nsACString& handler) const; + bool KeyMatchesAppName(const char *aKeyValue) const; + bool CheckHandlerMatchesAppName(const nsACString& handler) const; - NS_HIDDEN_(bool) GetAppPathFromLauncher(); + bool GetAppPathFromLauncher(); bool mCheckedThisSession; bool mUseLocaleFilenames; nsCString mAppPath; diff --git a/content/base/public/Element.h b/content/base/public/Element.h index 3e58f0e6c98..3af4ec90b5b 100644 --- a/content/base/public/Element.h +++ b/content/base/public/Element.h @@ -949,7 +949,7 @@ public: * @param aAttr name of attribute. * @param aValue Boolean value of attribute. */ - NS_HIDDEN_(bool) GetBoolAttr(nsIAtom* aAttr) const + bool GetBoolAttr(nsIAtom* aAttr) const { return HasAttr(kNameSpaceID_None, aAttr); } @@ -962,7 +962,7 @@ public: * @param aAttr name of attribute. * @param aValue Boolean value of attribute. */ - NS_HIDDEN_(nsresult) SetBoolAttr(nsIAtom* aAttr, bool aValue); + nsresult SetBoolAttr(nsIAtom* aAttr, bool aValue); /** * Retrieve the ratio of font-size-inflated text font size to computed font diff --git a/content/base/public/nsXMLNameSpaceMap.h b/content/base/public/nsXMLNameSpaceMap.h index 6e41e79c18f..07e559b21e6 100644 --- a/content/base/public/nsXMLNameSpaceMap.h +++ b/content/base/public/nsXMLNameSpaceMap.h @@ -31,20 +31,20 @@ public: * Allocates a new nsXMLNameSpaceMap (with new()) and if aForXML is * true initializes it with the xmlns and xml namespaces. */ - static NS_HIDDEN_(nsXMLNameSpaceMap*) Create(bool aForXML); + static nsXMLNameSpaceMap* Create(bool aForXML); /** * Add a prefix and its corresponding namespace ID to the map. * Passing a null |aPrefix| corresponds to the default namespace, which may * be set to something other than kNameSpaceID_None. */ - NS_HIDDEN_(nsresult) AddPrefix(nsIAtom *aPrefix, int32_t aNameSpaceID); + nsresult AddPrefix(nsIAtom *aPrefix, int32_t aNameSpaceID); /** * Add a prefix and a namespace URI to the map. The URI will be converted * to its corresponding namespace ID. */ - NS_HIDDEN_(nsresult) AddPrefix(nsIAtom *aPrefix, nsString &aURI); + nsresult AddPrefix(nsIAtom *aPrefix, nsString &aURI); /* * Returns the namespace ID for the given prefix, if it is in the map. @@ -52,16 +52,16 @@ public: * (kNameSpaceID_None) is returned. If |aPrefix| is non-null and is not in * the map, then kNameSpaceID_Unknown is returned. */ - NS_HIDDEN_(int32_t) FindNameSpaceID(nsIAtom *aPrefix) const; + int32_t FindNameSpaceID(nsIAtom *aPrefix) const; /** * If the given namespace ID is in the map, then the first prefix which * maps to that namespace is returned. Otherwise, null is returned. */ - NS_HIDDEN_(nsIAtom*) FindPrefix(int32_t aNameSpaceID) const; + nsIAtom* FindPrefix(int32_t aNameSpaceID) const; /* Removes all prefix mappings. */ - NS_HIDDEN_(void) Clear(); + void Clear(); ~nsXMLNameSpaceMap() { Clear(); } diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h index 4faedf7d7c6..a9509258158 100644 --- a/content/base/src/nsContentList.h +++ b/content/base/src/nsContentList.h @@ -284,9 +284,9 @@ public: nsTArray& aNames) MOZ_OVERRIDE; // nsContentList public methods - NS_HIDDEN_(uint32_t) Length(bool aDoFlush); - NS_HIDDEN_(nsIContent*) Item(uint32_t aIndex, bool aDoFlush); - NS_HIDDEN_(mozilla::dom::Element*) + uint32_t Length(bool aDoFlush); + nsIContent* Item(uint32_t aIndex, bool aDoFlush); + mozilla::dom::Element* NamedItem(const nsAString& aName, bool aDoFlush); // nsIMutationObserver diff --git a/content/base/src/nsContentSink.h b/content/base/src/nsContentSink.h index 305f828c9c4..fa210318d07 100644 --- a/content/base/src/nsContentSink.h +++ b/content/base/src/nsContentSink.h @@ -92,13 +92,13 @@ class nsContentSink : public nsICSSLoaderObserver, virtual nsresult ProcessMETATag(nsIContent* aContent); // nsIContentSink implementation helpers - NS_HIDDEN_(nsresult) WillParseImpl(void); - NS_HIDDEN_(nsresult) WillInterruptImpl(void); - NS_HIDDEN_(nsresult) WillResumeImpl(void); - NS_HIDDEN_(nsresult) DidProcessATokenImpl(void); - NS_HIDDEN_(void) WillBuildModelImpl(void); - NS_HIDDEN_(void) DidBuildModelImpl(bool aTerminated); - NS_HIDDEN_(void) DropParserAndPerfHint(void); + nsresult WillParseImpl(void); + nsresult WillInterruptImpl(void); + nsresult WillResumeImpl(void); + nsresult DidProcessATokenImpl(void); + void WillBuildModelImpl(void); + void DidBuildModelImpl(bool aTerminated); + void DropParserAndPerfHint(void); bool IsScriptExecutingImpl(); void NotifyAppend(nsIContent* aContent, uint32_t aStartIndex); diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index d3b486b0f60..87f71056bc4 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -969,53 +969,53 @@ public: int32_t aNamespaceID, nsIContent **aResult) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) Sanitize(); + virtual void Sanitize(); - virtual NS_HIDDEN_(void) EnumerateSubDocuments(nsSubDocEnumFunc aCallback, + virtual void EnumerateSubDocuments(nsSubDocEnumFunc aCallback, void *aData); - virtual NS_HIDDEN_(bool) CanSavePresentation(nsIRequest *aNewRequest); - virtual NS_HIDDEN_(void) Destroy(); - virtual NS_HIDDEN_(void) RemovedFromDocShell(); - virtual NS_HIDDEN_(already_AddRefed) GetLayoutHistoryState() const; + virtual bool CanSavePresentation(nsIRequest *aNewRequest); + virtual void Destroy(); + virtual void RemovedFromDocShell(); + virtual already_AddRefed GetLayoutHistoryState() const; - virtual NS_HIDDEN_(void) BlockOnload(); - virtual NS_HIDDEN_(void) UnblockOnload(bool aFireSync); + virtual void BlockOnload(); + virtual void UnblockOnload(bool aFireSync); - virtual NS_HIDDEN_(void) AddStyleRelevantLink(mozilla::dom::Link* aLink); - virtual NS_HIDDEN_(void) ForgetLink(mozilla::dom::Link* aLink); + virtual void AddStyleRelevantLink(mozilla::dom::Link* aLink); + virtual void ForgetLink(mozilla::dom::Link* aLink); - NS_HIDDEN_(void) ClearBoxObjectFor(nsIContent* aContent); + void ClearBoxObjectFor(nsIContent* aContent); already_AddRefed GetBoxObjectFor(mozilla::dom::Element* aElement, mozilla::ErrorResult& aRv) MOZ_OVERRIDE; - virtual NS_HIDDEN_(Element*) + virtual Element* GetAnonymousElementByAttribute(nsIContent* aElement, nsIAtom* aAttrName, const nsAString& aAttrValue) const; - virtual NS_HIDDEN_(Element*) ElementFromPointHelper(float aX, float aY, + virtual Element* ElementFromPointHelper(float aX, float aY, bool aIgnoreRootScrollFrame, bool aFlushLayout); - virtual NS_HIDDEN_(nsresult) NodesFromRectHelper(float aX, float aY, + virtual nsresult NodesFromRectHelper(float aX, float aY, float aTopSize, float aRightSize, float aBottomSize, float aLeftSize, bool aIgnoreRootScrollFrame, bool aFlushLayout, nsIDOMNodeList** aReturn); - virtual NS_HIDDEN_(void) FlushSkinBindings(); + virtual void FlushSkinBindings(); - virtual NS_HIDDEN_(nsresult) InitializeFrameLoader(nsFrameLoader* aLoader); - virtual NS_HIDDEN_(nsresult) FinalizeFrameLoader(nsFrameLoader* aLoader); - virtual NS_HIDDEN_(void) TryCancelFrameLoaderInitialization(nsIDocShell* aShell); - virtual NS_HIDDEN_(bool) FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell); - virtual NS_HIDDEN_(nsIDocument*) + virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader); + virtual nsresult FinalizeFrameLoader(nsFrameLoader* aLoader); + virtual void TryCancelFrameLoaderInitialization(nsIDocShell* aShell); + virtual bool FrameLoaderScheduledToBeFinalized(nsIDocShell* aShell); + virtual nsIDocument* RequestExternalResource(nsIURI* aURI, nsINode* aRequestingNode, ExternalResourceLoad** aPendingLoad); - virtual NS_HIDDEN_(void) + virtual void EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData); nsTArray mHostObjectURIs; @@ -1099,9 +1099,9 @@ public: virtual void MozSetImageElement(const nsAString& aImageElementId, Element* aElement) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) AddImage(imgIRequest* aImage); - virtual NS_HIDDEN_(nsresult) RemoveImage(imgIRequest* aImage, uint32_t aFlags); - virtual NS_HIDDEN_(nsresult) SetImageLockingState(bool aLocked); + virtual nsresult AddImage(imgIRequest* aImage); + virtual nsresult RemoveImage(imgIRequest* aImage, uint32_t aFlags); + virtual nsresult SetImageLockingState(bool aLocked); // AddPlugin adds a plugin-related element to mPlugins when the element is // added to the tree. diff --git a/content/base/src/nsFrameLoader.h b/content/base/src/nsFrameLoader.h index 1886948cd26..2ce412206b9 100644 --- a/content/base/src/nsFrameLoader.h +++ b/content/base/src/nsFrameLoader.h @@ -174,7 +174,7 @@ public: NS_DECL_NSIFRAMELOADER NS_DECL_NSICONTENTVIEWMANAGER NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED - NS_HIDDEN_(nsresult) CheckForRecursiveLoad(nsIURI* aURI); + nsresult CheckForRecursiveLoad(nsIURI* aURI); nsresult ReallyStartLoading(); void Finalize(); nsIDocShell* GetExistingDocShell() { return mDocShell; } @@ -372,7 +372,7 @@ private: // Updates the subdocument position and size. This gets called only // when we have our own in-process DocShell. - NS_HIDDEN_(nsresult) UpdateBaseWindowPositionAndSize(nsSubDocumentFrame *aIFrame); + nsresult UpdateBaseWindowPositionAndSize(nsSubDocumentFrame *aIFrame); nsresult CheckURILoad(nsIURI* aURI); void FireErrorEvent(); nsresult ReallyStartLoadingInternal(); diff --git a/content/base/src/nsPropertyTable.cpp b/content/base/src/nsPropertyTable.cpp index 95c01c82ad0..c99acf2c968 100644 --- a/content/base/src/nsPropertyTable.cpp +++ b/content/base/src/nsPropertyTable.cpp @@ -45,12 +45,12 @@ public: // Removes the property associated with the given object, and destroys // the property value - NS_HIDDEN_(bool) DeletePropertyFor(nsPropertyOwner aObject); + bool DeletePropertyFor(nsPropertyOwner aObject); // Destroy all remaining properties (without removing them) - NS_HIDDEN_(void) Destroy(); + void Destroy(); - NS_HIDDEN_(bool) Equals(nsIAtom *aPropertyName) + bool Equals(nsIAtom *aPropertyName) { return mName == aPropertyName; } diff --git a/content/base/src/nsPropertyTable.h b/content/base/src/nsPropertyTable.h index f8fcc582fda..510fd1bc796 100644 --- a/content/base/src/nsPropertyTable.h +++ b/content/base/src/nsPropertyTable.h @@ -93,7 +93,7 @@ class nsPropertyTable * table changes too). If |aTransfer| is false the property will just be * deleted instead. */ - NS_HIDDEN_(nsresult) SetProperty(nsPropertyOwner aObject, + nsresult SetProperty(nsPropertyOwner aObject, nsIAtom *aPropertyName, void *aPropertyValue, NSPropertyDtorFunc aDtor, @@ -109,7 +109,7 @@ class nsPropertyTable * Delete the property |aPropertyName| in the global category for object * |aObject|. The property's destructor function will be called. */ - NS_HIDDEN_(nsresult) DeleteProperty(nsPropertyOwner aObject, + nsresult DeleteProperty(nsPropertyOwner aObject, nsIAtom *aPropertyName); /** @@ -128,7 +128,7 @@ class nsPropertyTable * Deletes all of the properties for object |aObject|, calling the * destructor function for each property. */ - NS_HIDDEN_(void) DeleteAllPropertiesFor(nsPropertyOwner aObject); + void DeleteAllPropertiesFor(nsPropertyOwner aObject); /** * Transfers all properties for object |aObject| that were set with the @@ -137,7 +137,7 @@ class nsPropertyTable * If transfering a property fails, this deletes all the properties for * object |aObject|. */ - NS_HIDDEN_(nsresult) + nsresult TransferOrDeleteAllPropertiesFor(nsPropertyOwner aObject, nsPropertyTable *aOtherTable); @@ -146,7 +146,7 @@ class nsPropertyTable * For every property |aCallback| will be called with as arguments |aObject|, * the property name, the property value and |aData|. */ - NS_HIDDEN_(void) Enumerate(nsPropertyOwner aObject, + void Enumerate(nsPropertyOwner aObject, NSPropertyFunc aCallback, void *aData); /** @@ -154,13 +154,13 @@ class nsPropertyTable * For every property |aCallback| will be called with arguments the owner, * the property name, the property value and |aData|. */ - NS_HIDDEN_(void) EnumerateAll(NSPropertyFunc aCallback, void *aData); + void EnumerateAll(NSPropertyFunc aCallback, void *aData); /** * Deletes all of the properties for all objects in the property * table, calling the destructor function for each property. */ - NS_HIDDEN_(void) DeleteAllProperties(); + void DeleteAllProperties(); nsPropertyTable() : mPropertyList(nullptr) {} ~nsPropertyTable() { @@ -181,13 +181,13 @@ class nsPropertyTable size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; private: - NS_HIDDEN_(void) DestroyPropertyList(); - NS_HIDDEN_(PropertyList*) GetPropertyListFor(nsIAtom *aPropertyName) const; - NS_HIDDEN_(void*) GetPropertyInternal(nsPropertyOwner aObject, + void DestroyPropertyList(); + PropertyList* GetPropertyListFor(nsIAtom *aPropertyName) const; + void* GetPropertyInternal(nsPropertyOwner aObject, nsIAtom *aPropertyName, bool aRemove, nsresult *aStatus); - NS_HIDDEN_(nsresult) SetPropertyInternal(nsPropertyOwner aObject, + nsresult SetPropertyInternal(nsPropertyOwner aObject, nsIAtom *aPropertyName, void *aPropertyValue, NSPropertyDtorFunc aDtor, diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp index 215dbffc0c2..a53016faf37 100644 --- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -119,7 +119,7 @@ static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); // This must come outside of any namespace, or else it won't overload with the // double based version in nsMathUtils.h -inline NS_HIDDEN_(mozilla::Decimal) +inline mozilla::Decimal NS_floorModulo(mozilla::Decimal x, mozilla::Decimal y) { return (x - y * (x / y).floor()); diff --git a/content/html/content/src/HTMLObjectElement.h b/content/html/content/src/HTMLObjectElement.h index 76f801983e9..bbfaaea37e7 100644 --- a/content/html/content/src/HTMLObjectElement.h +++ b/content/html/content/src/HTMLObjectElement.h @@ -225,7 +225,7 @@ private: /** * Calls LoadObject with the correct arguments to start the plugin load. */ - NS_HIDDEN_(void) StartObjectLoad(bool aNotify); + void StartObjectLoad(bool aNotify); /** * Returns if the element is currently focusable regardless of it's tabindex diff --git a/content/html/content/src/HTMLSharedObjectElement.h b/content/html/content/src/HTMLSharedObjectElement.h index 89712be1e7f..6528cd9607b 100644 --- a/content/html/content/src/HTMLSharedObjectElement.h +++ b/content/html/content/src/HTMLSharedObjectElement.h @@ -192,7 +192,7 @@ private: /** * Calls LoadObject with the correct arguments to start the plugin load. */ - NS_HIDDEN_(void) StartObjectLoad(bool aNotify); + void StartObjectLoad(bool aNotify); nsIAtom *URIAttrName() const { diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index 273863ad567..2653d8c5a09 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -825,7 +825,7 @@ public: * Get the presentation context for this content node. * @return the presentation context */ - NS_HIDDEN_(nsPresContext*) GetPresContext(); + nsPresContext* GetPresContext(); // Form Helper Routines /** @@ -851,7 +851,7 @@ public: /** * Locate an nsIEditor rooted at this content node, if there is one. */ - NS_HIDDEN_(nsresult) GetEditor(nsIEditor** aEditor); + nsresult GetEditor(nsIEditor** aEditor); /** * Helper method for NS_IMPL_URI_ATTR macro. @@ -864,7 +864,7 @@ public: * @param aBaseAttr name of base attribute. * @param aResult result value [out] */ - NS_HIDDEN_(void) GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString& aResult) const; + void GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString& aResult) const; /** * Gets the absolute URI values of an attribute, by resolving any relative @@ -1033,7 +1033,7 @@ protected: * @param aDefault default-value to return if attribute isn't set. * @param aResult result value [out] */ - NS_HIDDEN_(nsresult) SetAttrHelper(nsIAtom* aAttr, const nsAString& aValue); + nsresult SetAttrHelper(nsIAtom* aAttr, const nsAString& aValue); /** * Helper method for NS_IMPL_INT_ATTR macro. @@ -1044,7 +1044,7 @@ protected: * @param aAttr name of attribute. * @param aDefault default-value to return if attribute isn't set. */ - NS_HIDDEN_(int32_t) GetIntAttr(nsIAtom* aAttr, int32_t aDefault) const; + int32_t GetIntAttr(nsIAtom* aAttr, int32_t aDefault) const; /** * Helper method for NS_IMPL_INT_ATTR macro. @@ -1054,7 +1054,7 @@ protected: * @param aAttr name of attribute. * @param aValue Integer value of attribute. */ - NS_HIDDEN_(nsresult) SetIntAttr(nsIAtom* aAttr, int32_t aValue); + nsresult SetIntAttr(nsIAtom* aAttr, int32_t aValue); /** * Helper method for NS_IMPL_UINT_ATTR macro. @@ -1111,7 +1111,7 @@ protected: * @param aAttr name of attribute. * @param aResult result value [out] */ - NS_HIDDEN_(nsresult) GetURIListAttr(nsIAtom* aAttr, nsAString& aResult); + nsresult GetURIListAttr(nsIAtom* aAttr, nsAString& aResult); /** * Helper method for NS_IMPL_ENUM_ATTR_DEFAULT_VALUE. @@ -1122,7 +1122,7 @@ protected: * @param aDefault the default value if the attribute is missing or invalid. * @param aResult string corresponding to the value [out]. */ - NS_HIDDEN_(void) GetEnumAttr(nsIAtom* aAttr, + void GetEnumAttr(nsIAtom* aAttr, const char* aDefault, nsAString& aResult) const; @@ -1137,7 +1137,7 @@ protected: * @param aDefaultInvalid the default value if the attribute is invalid. * @param aResult string corresponding to the value [out]. */ - NS_HIDDEN_(void) GetEnumAttr(nsIAtom* aAttr, + void GetEnumAttr(nsIAtom* aAttr, const char* aDefaultMissing, const char* aDefaultInvalid, nsAString& aResult) const; @@ -1183,7 +1183,7 @@ protected: * contentEditable attribute and its value is "false". Otherwise returns * eInherit. */ - NS_HIDDEN_(ContentEditableTristate) GetContentEditableValue() const + ContentEditableTristate GetContentEditableValue() const { static const nsIContent::AttrValuesArray values[] = { &nsGkAtoms::_false, &nsGkAtoms::_true, &nsGkAtoms::_empty, nullptr }; diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h index 407f679bdf6..9ffd02a587d 100644 --- a/content/html/document/src/nsHTMLDocument.h +++ b/content/html/document/src/nsHTMLDocument.h @@ -80,9 +80,9 @@ public: return mWriteLevel != uint32_t(0); } - virtual NS_HIDDEN_(nsContentList*) GetForms(); + virtual nsContentList* GetForms(); - virtual NS_HIDDEN_(nsContentList*) GetFormControls(); + virtual nsContentList* GetFormControls(); // nsIDOMDocument interface using nsDocument::CreateElement; @@ -155,7 +155,7 @@ public: virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) RemovedFromDocShell() MOZ_OVERRIDE; + virtual void RemovedFromDocShell() MOZ_OVERRIDE; virtual mozilla::dom::Element *GetElementById(const nsAString& aElementId) { diff --git a/content/xul/document/src/XULDocument.h b/content/xul/document/src/XULDocument.h index e0180f031ae..8c176c94493 100644 --- a/content/xul/document/src/XULDocument.h +++ b/content/xul/document/src/XULDocument.h @@ -281,7 +281,7 @@ protected: already_AddRefed GetWindowRoot(); - static NS_HIDDEN_(void) DirectionChanged(const char* aPrefName, void* aData); + static void DirectionChanged(const char* aPrefName, void* aData); // pseudo constants static int32_t gRefCnt; diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 725d0dd2514..e042d15030f 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -429,67 +429,67 @@ public: NS_DECL_NSIINLINEEVENTHANDLERS // nsPIDOMWindow - virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot(); + virtual nsPIDOMWindow* GetPrivateRoot(); // Outer windows only. - virtual NS_HIDDEN_(void) ActivateOrDeactivate(bool aActivate); - virtual NS_HIDDEN_(void) SetActive(bool aActive); - virtual NS_HIDDEN_(void) SetIsBackground(bool aIsBackground); - virtual NS_HIDDEN_(void) SetChromeEventHandler(mozilla::dom::EventTarget* aChromeEventHandler); + virtual void ActivateOrDeactivate(bool aActivate); + virtual void SetActive(bool aActive); + virtual void SetIsBackground(bool aIsBackground); + virtual void SetChromeEventHandler(mozilla::dom::EventTarget* aChromeEventHandler); // Outer windows only. - virtual NS_HIDDEN_(void) SetInitialPrincipalToSubject(); + virtual void SetInitialPrincipalToSubject(); - virtual NS_HIDDEN_(PopupControlState) PushPopupControlState(PopupControlState state, bool aForce) const; - virtual NS_HIDDEN_(void) PopPopupControlState(PopupControlState state) const; - virtual NS_HIDDEN_(PopupControlState) GetPopupControlState() const; + virtual PopupControlState PushPopupControlState(PopupControlState state, bool aForce) const; + virtual void PopPopupControlState(PopupControlState state) const; + virtual PopupControlState GetPopupControlState() const; virtual already_AddRefed SaveWindowState(); - virtual NS_HIDDEN_(nsresult) RestoreWindowState(nsISupports *aState); - virtual NS_HIDDEN_(void) SuspendTimeouts(uint32_t aIncrease = 1, + virtual nsresult RestoreWindowState(nsISupports *aState); + virtual void SuspendTimeouts(uint32_t aIncrease = 1, bool aFreezeChildren = true); - virtual NS_HIDDEN_(nsresult) ResumeTimeouts(bool aThawChildren = true); - virtual NS_HIDDEN_(uint32_t) TimeoutSuspendCount(); - virtual NS_HIDDEN_(nsresult) FireDelayedDOMEvents(); - virtual NS_HIDDEN_(bool) IsFrozen() const + virtual nsresult ResumeTimeouts(bool aThawChildren = true); + virtual uint32_t TimeoutSuspendCount(); + virtual nsresult FireDelayedDOMEvents(); + virtual bool IsFrozen() const { return mIsFrozen; } - virtual NS_HIDDEN_(bool) IsRunningTimeout() { return mTimeoutFiringDepth > 0; } + virtual bool IsRunningTimeout() { return mTimeoutFiringDepth > 0; } // Outer windows only. - virtual NS_HIDDEN_(bool) WouldReuseInnerWindow(nsIDocument* aNewDocument); + virtual bool WouldReuseInnerWindow(nsIDocument* aNewDocument); - virtual NS_HIDDEN_(void) SetDocShell(nsIDocShell* aDocShell); + virtual void SetDocShell(nsIDocShell* aDocShell); virtual void DetachFromDocShell(); - virtual NS_HIDDEN_(nsresult) SetNewDocument(nsIDocument *aDocument, + virtual nsresult SetNewDocument(nsIDocument *aDocument, nsISupports *aState, bool aForceReuseInnerWindow); // Outer windows only. void DispatchDOMWindowCreated(); - virtual NS_HIDDEN_(void) SetOpenerWindow(nsIDOMWindow* aOpener, + virtual void SetOpenerWindow(nsIDOMWindow* aOpener, bool aOriginalOpener); // Outer windows only. - virtual NS_HIDDEN_(void) EnsureSizeUpToDate(); + virtual void EnsureSizeUpToDate(); - virtual NS_HIDDEN_(void) EnterModalState(); - virtual NS_HIDDEN_(void) LeaveModalState(); + virtual void EnterModalState(); + virtual void LeaveModalState(); // Outer windows only. - virtual NS_HIDDEN_(bool) CanClose(); - virtual NS_HIDDEN_(void) ForceClose(); + virtual bool CanClose(); + virtual void ForceClose(); - virtual NS_HIDDEN_(void) MaybeUpdateTouchState(); - virtual NS_HIDDEN_(void) UpdateTouchState(); - virtual NS_HIDDEN_(bool) DispatchCustomEvent(const char *aEventName); - virtual NS_HIDDEN_(bool) DispatchResizeEvent(const nsIntSize& aSize); - virtual NS_HIDDEN_(void) RefreshCompartmentPrincipal(); - virtual NS_HIDDEN_(nsresult) SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust); + virtual void MaybeUpdateTouchState(); + virtual void UpdateTouchState(); + virtual bool DispatchCustomEvent(const char *aEventName); + virtual bool DispatchResizeEvent(const nsIntSize& aSize); + virtual void RefreshCompartmentPrincipal(); + virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust); - virtual NS_HIDDEN_(void) SetHasGamepadEventListener(bool aHasGamepad = true); + virtual void SetHasGamepadEventListener(bool aHasGamepad = true); // nsIInterfaceRequestor NS_DECL_NSIINTERFACEREQUESTOR @@ -635,10 +635,10 @@ public: void RiskyUnlink(); #endif - virtual NS_HIDDEN_(JSObject*) + virtual JSObject* GetCachedXBLPrototypeHandler(nsXBLPrototypeHandler* aKey); - virtual NS_HIDDEN_(void) + virtual void CacheXBLPrototypeHandler(nsXBLPrototypeHandler* aKey, JS::Handle aHandler); @@ -1154,7 +1154,7 @@ protected: * * @param aReturn [out] The window that was opened, if any. */ - NS_HIDDEN_(nsresult) OpenInternal(const nsAString& aUrl, + nsresult OpenInternal(const nsAString& aUrl, const nsAString& aName, const nsAString& aOptions, bool aDialog, diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h index 99b44e0e379..dbae40a2522 100644 --- a/dom/base/nsPIDOMWindow.h +++ b/dom/base/nsPIDOMWindow.h @@ -188,7 +188,7 @@ public: return mDoc; } - virtual NS_HIDDEN_(bool) IsRunningTimeout() = 0; + virtual bool IsRunningTimeout() = 0; // Audio API bool GetAudioMuted() const; diff --git a/dom/xbl/nsBindingManager.h b/dom/xbl/nsBindingManager.h index e884ea8d6d6..67b88967b18 100644 --- a/dom/xbl/nsBindingManager.h +++ b/dom/xbl/nsBindingManager.h @@ -118,7 +118,7 @@ public: void AppendAllSheets(nsTArray& aArray); - NS_HIDDEN_(void) Traverse(nsIContent *aContent, + void Traverse(nsIContent *aContent, nsCycleCollectionTraversalCallback &cb); NS_DECL_CYCLE_COLLECTION_CLASS(nsBindingManager) diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h index 41f65b31be3..4a7288ef2ad 100644 --- a/gfx/thebes/gfxFont.h +++ b/gfx/thebes/gfxFont.h @@ -3778,6 +3778,6 @@ protected: bool aUseFontSet, void *closure); - static NS_HIDDEN_(nsILanguageAtomService*) gLangService; + static nsILanguageAtomService* gLangService; }; #endif diff --git a/image/decoders/icon/android/nsIconChannel.h b/image/decoders/icon/android/nsIconChannel.h index d5084128a85..f3540fd5209 100644 --- a/image/decoders/icon/android/nsIconChannel.h +++ b/image/decoders/icon/android/nsIconChannel.h @@ -32,7 +32,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel { * Must be called before calling any other function on this object. * If this method fails, no other function must be called on this object. */ - NS_HIDDEN_(nsresult) Init(nsIURI* aURI); + nsresult Init(nsIURI* aURI); private: /** * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html). diff --git a/image/decoders/icon/gtk/nsIconChannel.h b/image/decoders/icon/gtk/nsIconChannel.h index 7a911c76ab1..7ef400f34ff 100644 --- a/image/decoders/icon/gtk/nsIconChannel.h +++ b/image/decoders/icon/gtk/nsIconChannel.h @@ -34,7 +34,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel { * Must be called before calling any other function on this object. * If this method fails, no other function must be called on this object. */ - NS_HIDDEN_(nsresult) Init(nsIURI* aURI); + nsresult Init(nsIURI* aURI); private: /** * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html). diff --git a/image/decoders/icon/qt/nsIconChannel.h b/image/decoders/icon/qt/nsIconChannel.h index 9590e8269be..73f58fd7d9c 100644 --- a/image/decoders/icon/qt/nsIconChannel.h +++ b/image/decoders/icon/qt/nsIconChannel.h @@ -33,7 +33,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel { * Must be called before calling any other function on this object. * If this method fails, no other function must be called on this object. */ - NS_HIDDEN_(nsresult) Init(nsIURI* aURI); + nsresult Init(nsIURI* aURI); private: /** * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html). diff --git a/intl/locale/src/nsLanguageAtomService.h b/intl/locale/src/nsLanguageAtomService.h index b0844909a97..74c8732abdd 100644 --- a/intl/locale/src/nsLanguageAtomService.h +++ b/intl/locale/src/nsLanguageAtomService.h @@ -19,15 +19,15 @@ public: NS_DECL_ISUPPORTS // nsILanguageAtomService - virtual NS_HIDDEN_(nsIAtom*) + virtual nsIAtom* LookupLanguage(const nsACString &aLanguage, nsresult *aError); - virtual NS_HIDDEN_(already_AddRefed) + virtual already_AddRefed LookupCharSet(const nsACString& aCharSet); - virtual NS_HIDDEN_(nsIAtom*) GetLocaleLanguage(nsresult *aError); + virtual nsIAtom* GetLocaleLanguage(nsresult *aError); - virtual NS_HIDDEN_(nsIAtom*) GetLanguageGroup(nsIAtom *aLanguage, + virtual nsIAtom* GetLanguageGroup(nsIAtom *aLanguage, nsresult *aError); nsLanguageAtomService() NS_HIDDEN; @@ -36,7 +36,7 @@ private: NS_HIDDEN ~nsLanguageAtomService() { } protected: - NS_HIDDEN_(nsresult) InitLangGroupTable(); + nsresult InitLangGroupTable(); nsInterfaceHashtable mLangToGroup; nsCOMPtr mLangGroups; diff --git a/layout/base/RestyleManager.h b/layout/base/RestyleManager.h index c2f20eff841..9a24a43257d 100644 --- a/layout/base/RestyleManager.h +++ b/layout/base/RestyleManager.h @@ -94,14 +94,14 @@ public: * * @param aFrame the root of the subtree to reparent. Must not be null. */ - NS_HIDDEN_(nsresult) ReparentStyleContext(nsIFrame* aFrame); + nsresult ReparentStyleContext(nsIFrame* aFrame); /** * Re-resolve the style contexts for a frame tree, building * aChangeList based on the resulting style changes, plus aMinChange * applied to aFrame. */ - NS_HIDDEN_(void) + void ComputeStyleChangeFor(nsIFrame* aFrame, nsStyleChangeList* aChangeList, nsChangeHint aMinChange, @@ -112,7 +112,7 @@ public: /** * DEBUG ONLY method to verify integrity of style tree versus frame tree */ - NS_HIDDEN_(void) DebugVerifyStyleTree(nsIFrame* aFrame); + void DebugVerifyStyleTree(nsIFrame* aFrame); #endif // Note: It's the caller's responsibility to make sure to wrap a diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index 1af255d7467..c71e672664e 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -87,18 +87,18 @@ public: UndisplayedMap(uint32_t aNumBuckets = 16) NS_HIDDEN; ~UndisplayedMap(void) NS_HIDDEN; - NS_HIDDEN_(UndisplayedNode*) GetFirstNode(nsIContent* aParentContent); + UndisplayedNode* GetFirstNode(nsIContent* aParentContent); - NS_HIDDEN_(nsresult) AddNodeFor(nsIContent* aParentContent, + nsresult AddNodeFor(nsIContent* aParentContent, nsIContent* aChild, nsStyleContext* aStyle); - NS_HIDDEN_(void) RemoveNodeFor(nsIContent* aParentContent, + void RemoveNodeFor(nsIContent* aParentContent, UndisplayedNode* aNode); - NS_HIDDEN_(void) RemoveNodesFor(nsIContent* aParentContent); + void RemoveNodesFor(nsIContent* aParentContent); // Removes all entries from the hash table - NS_HIDDEN_(void) Clear(void); + void Clear(void); protected: /** @@ -106,8 +106,8 @@ protected: * is a element, |**aParentContent| is set to * the parent of the children element. */ - NS_HIDDEN_(PLHashEntry**) GetEntryFor(nsIContent** aParentContent); - NS_HIDDEN_(void) AppendNodeFor(UndisplayedNode* aNode, + PLHashEntry** GetEntryFor(nsIContent** aParentContent); + void AppendNodeFor(UndisplayedNode* aNode, nsIContent* aParentContent); PLHashTable* mTable; diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h index 9f93a83d951..a3b033eb999 100644 --- a/layout/base/nsFrameManager.h +++ b/layout/base/nsFrameManager.h @@ -89,48 +89,48 @@ public: * Destroy should be called when the frame tree managed by the frame * manager is no longer being displayed. */ - NS_HIDDEN_(void) Destroy(); + void Destroy(); // Placeholder frame functions - NS_HIDDEN_(nsPlaceholderFrame*) GetPlaceholderFrameFor(const nsIFrame* aFrame); - NS_HIDDEN_(nsresult) + nsPlaceholderFrame* GetPlaceholderFrameFor(const nsIFrame* aFrame); + nsresult RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame); - NS_HIDDEN_(void) + void UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame); - NS_HIDDEN_(void) ClearPlaceholderFrameMap(); + void ClearPlaceholderFrameMap(); // Mapping undisplayed content - NS_HIDDEN_(nsStyleContext*) GetUndisplayedContent(nsIContent* aContent); - NS_HIDDEN_(mozilla::UndisplayedNode*) + nsStyleContext* GetUndisplayedContent(nsIContent* aContent); + mozilla::UndisplayedNode* GetAllUndisplayedContentIn(nsIContent* aParentContent); - NS_HIDDEN_(void) SetUndisplayedContent(nsIContent* aContent, + void SetUndisplayedContent(nsIContent* aContent, nsStyleContext* aStyleContext); - NS_HIDDEN_(void) ChangeUndisplayedContent(nsIContent* aContent, + void ChangeUndisplayedContent(nsIContent* aContent, nsStyleContext* aStyleContext); - NS_HIDDEN_(void) ClearUndisplayedContentIn(nsIContent* aContent, + void ClearUndisplayedContentIn(nsIContent* aContent, nsIContent* aParentContent); - NS_HIDDEN_(void) ClearAllUndisplayedContentIn(nsIContent* aParentContent); + void ClearAllUndisplayedContentIn(nsIContent* aParentContent); // Functions for manipulating the frame model - NS_HIDDEN_(void) AppendFrames(nsContainerFrame* aParentFrame, - ChildListID aListID, - nsFrameList& aFrameList); + void AppendFrames(nsContainerFrame* aParentFrame, + ChildListID aListID, + nsFrameList& aFrameList); - NS_HIDDEN_(void) InsertFrames(nsContainerFrame* aParentFrame, - ChildListID aListID, - nsIFrame* aPrevFrame, - nsFrameList& aFrameList); + void InsertFrames(nsContainerFrame* aParentFrame, + ChildListID aListID, + nsIFrame* aPrevFrame, + nsFrameList& aFrameList); - NS_HIDDEN_(void) RemoveFrame(ChildListID aListID, - nsIFrame* aOldFrame); + void RemoveFrame(ChildListID aListID, + nsIFrame* aOldFrame); /* * Notification that a frame is about to be destroyed. This allows any * outstanding references to the frame to be cleaned up. */ - NS_HIDDEN_(void) NotifyDestroyingFrame(nsIFrame* aFrame); + void NotifyDestroyingFrame(nsIFrame* aFrame); /* * Capture/restore frame state for the frame subtree rooted at aFrame. @@ -141,23 +141,23 @@ public: * of aFrame. */ - NS_HIDDEN_(void) CaptureFrameState(nsIFrame* aFrame, + void CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState); - NS_HIDDEN_(void) RestoreFrameState(nsIFrame* aFrame, + void RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState); /* * Add/restore state for one frame */ - NS_HIDDEN_(void) CaptureFrameStateFor(nsIFrame* aFrame, + void CaptureFrameStateFor(nsIFrame* aFrame, nsILayoutHistoryState* aState); - NS_HIDDEN_(void) RestoreFrameStateFor(nsIFrame* aFrame, + void RestoreFrameStateFor(nsIFrame* aFrame, nsILayoutHistoryState* aState); - NS_HIDDEN_(nsIPresShell*) GetPresShell() const { return mPresShell; } - NS_HIDDEN_(nsPresContext*) GetPresContext() const { + nsIPresShell* GetPresShell() const { return mPresShell; } + nsPresContext* GetPresContext() const { return mPresShell->GetPresContext(); } }; diff --git a/layout/base/nsFrameManagerBase.h b/layout/base/nsFrameManagerBase.h index f7b2fbb231d..9fed423e7c6 100644 --- a/layout/base/nsFrameManagerBase.h +++ b/layout/base/nsFrameManagerBase.h @@ -46,8 +46,8 @@ public: * root frame is controlled by the frame manager. When the frame manager is * destroyed, it destroys the entire frame hierarchy. */ - NS_HIDDEN_(nsIFrame*) GetRootFrame() const { return mRootFrame; } - NS_HIDDEN_(void) SetRootFrame(nsIFrame* aRootFrame) + nsIFrame* GetRootFrame() const { return mRootFrame; } + void SetRootFrame(nsIFrame* aRootFrame) { NS_ASSERTION(!mRootFrame, "already have a root frame"); mRootFrame = aRootFrame; diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index 0e2d5eede0b..1a6377892b8 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -191,7 +191,7 @@ public: * content model and printing calls |EndObservingDocument| multiple * times to make form controls behave nicely when printed. */ - virtual NS_HIDDEN_(void) Destroy() = 0; + virtual void Destroy() = 0; bool IsDestroying() { return mIsDestroying; } @@ -205,7 +205,7 @@ public: * This is used in cases where a presshell is created for reasons * other than reflow/painting. */ - virtual NS_HIDDEN_(void) MakeZombie() = 0; + virtual void MakeZombie() = 0; /** * All frames owned by the shell are allocated from an arena. They @@ -327,8 +327,8 @@ public: */ // XXX these could easily be inlined, but there is a circular #include // problem with nsStyleSet. - NS_HIDDEN_(void) SetAuthorStyleDisabled(bool aDisabled); - NS_HIDDEN_(bool) GetAuthorStyleDisabled() const; + void SetAuthorStyleDisabled(bool aDisabled); + bool GetAuthorStyleDisabled() const; /* * Called when stylesheets are added/removed/enabled/disabled to rebuild @@ -340,8 +340,8 @@ public: * is calling AddOverrideStyleSheet/RemoveOverrideStyleSheet, and I think * those should just handle reconstructing style data... */ - virtual NS_HIDDEN_(void) ReconstructStyleDataExternal(); - NS_HIDDEN_(void) ReconstructStyleDataInternal(); + virtual void ReconstructStyleDataExternal(); + void ReconstructStyleDataInternal(); #ifdef MOZILLA_INTERNAL_API void ReconstructStyleData() { ReconstructStyleDataInternal(); } #else @@ -356,7 +356,7 @@ public: * * - initially created for bugs 31816, 20760, 22963 */ - virtual NS_HIDDEN_(nsresult) SetPreferenceStyleRules(bool aForceReflow) = 0; + virtual nsresult SetPreferenceStyleRules(bool aForceReflow) = 0; /** * FrameSelection will return the Frame based selection API. @@ -373,10 +373,10 @@ public: // Make shell be a document observer. If called after Destroy() has // been called on the shell, this will be ignored. - virtual NS_HIDDEN_(void) BeginObservingDocument() = 0; + virtual void BeginObservingDocument() = 0; // Make shell stop being a document observer - virtual NS_HIDDEN_(void) EndObservingDocument() = 0; + virtual void EndObservingDocument() = 0; /** * Return whether Initialize() was previously called. @@ -394,19 +394,19 @@ public: * is guaranteed to survive through arbitrary script execution. * Calling Initialize can execute arbitrary script. */ - virtual NS_HIDDEN_(nsresult) Initialize(nscoord aWidth, nscoord aHeight) = 0; + virtual nsresult Initialize(nscoord aWidth, nscoord aHeight) = 0; /** * Reflow the frame model into a new width and height. The * coordinates for aWidth and aHeight must be in standard nscoord's. */ - virtual NS_HIDDEN_(nsresult) ResizeReflow(nscoord aWidth, nscoord aHeight) = 0; + virtual nsresult ResizeReflow(nscoord aWidth, nscoord aHeight) = 0; /** * Reflow, and also change presshell state so as to only permit * reflowing off calls to ResizeReflowOverride() in the future. * ResizeReflow() calls are ignored after ResizeReflowOverride(). */ - virtual NS_HIDDEN_(nsresult) ResizeReflowOverride(nscoord aWidth, nscoord aHeight) = 0; + virtual nsresult ResizeReflowOverride(nscoord aWidth, nscoord aHeight) = 0; /** * Returns true if ResizeReflowOverride has been called. @@ -421,12 +421,12 @@ public: /** * Called when document load completes. */ - virtual NS_HIDDEN_(void) LoadComplete() = 0; + virtual void LoadComplete() = 0; /** * This calls through to the frame manager to get the root frame. */ - virtual NS_HIDDEN_(nsIFrame*) GetRootFrameExternal() const; + virtual nsIFrame* GetRootFrameExternal() const; nsIFrame* GetRootFrame() const { #ifdef MOZILLA_INTERNAL_API return mFrameManager->GetRootFrame(); @@ -465,7 +465,7 @@ public: * Returns the page sequence frame associated with the frame hierarchy. * Returns nullptr if not a paginated view. */ - virtual NS_HIDDEN_(nsIPageSequenceFrame*) GetPageSequenceFrame() const = 0; + virtual nsIPageSequenceFrame* GetPageSequenceFrame() const = 0; /** * Gets the real primary frame associated with the content object. @@ -474,13 +474,13 @@ public: * the real primary frame is the frame that is out of the flow and not the * placeholder frame. */ - virtual NS_HIDDEN_(nsIFrame*) GetRealPrimaryFrameFor(nsIContent* aContent) const = 0; + virtual nsIFrame* GetRealPrimaryFrameFor(nsIContent* aContent) const = 0; /** * Gets the placeholder frame associated with the specified frame. This is * a helper frame that forwards the request to the frame manager. */ - virtual NS_HIDDEN_(nsIFrame*) GetPlaceholderFrameFor(nsIFrame* aFrame) const = 0; + virtual nsIFrame* GetPlaceholderFrameFor(nsIFrame* aFrame) const = 0; /** * Tell the pres shell that a frame needs to be marked dirty and needs @@ -495,7 +495,7 @@ public: eTreeChange, // mark intrinsic widths dirty on aFrame and its ancestors eStyleChange // Do eTreeChange, plus all of aFrame's descendants }; - virtual NS_HIDDEN_(void) FrameNeedsReflow(nsIFrame *aFrame, + virtual void FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty, nsFrameState aBitToAdd) = 0; @@ -515,14 +515,14 @@ public: * method doesn't mark any intrinsic widths dirty and doesn't add any bits * other than NS_FRAME_HAS_DIRTY_CHILDREN. */ - virtual NS_HIDDEN_(void) FrameNeedsToContinueReflow(nsIFrame *aFrame) = 0; + virtual void FrameNeedsToContinueReflow(nsIFrame *aFrame) = 0; - virtual NS_HIDDEN_(void) CancelAllPendingReflows() = 0; + virtual void CancelAllPendingReflows() = 0; /** * Recreates the frames for a node */ - virtual NS_HIDDEN_(nsresult) RecreateFramesFor(nsIContent* aContent) = 0; + virtual nsresult RecreateFramesFor(nsIContent* aContent) = 0; void PostRecreateFramesFor(mozilla::dom::Element* aElement); void RestyleForAnimation(mozilla::dom::Element* aElement, @@ -538,7 +538,7 @@ public: * @param aIsSafeToFlush true if it is safe, false otherwise. * */ - virtual NS_HIDDEN_(bool) IsSafeToFlush() const = 0; + virtual bool IsSafeToFlush() const = 0; /** * Flush pending notifications of the type specified. This method @@ -549,17 +549,17 @@ public: * * @param aType the type of notifications to flush */ - virtual NS_HIDDEN_(void) FlushPendingNotifications(mozFlushType aType) = 0; - virtual NS_HIDDEN_(void) FlushPendingNotifications(mozilla::ChangesToFlush aType) = 0; + virtual void FlushPendingNotifications(mozFlushType aType) = 0; + virtual void FlushPendingNotifications(mozilla::ChangesToFlush aType) = 0; /** * Callbacks will be called even if reflow itself fails for * some reason. */ - virtual NS_HIDDEN_(nsresult) PostReflowCallback(nsIReflowCallback* aCallback) = 0; - virtual NS_HIDDEN_(void) CancelReflowCallback(nsIReflowCallback* aCallback) = 0; + virtual nsresult PostReflowCallback(nsIReflowCallback* aCallback) = 0; + virtual void CancelReflowCallback(nsIReflowCallback* aCallback) = 0; - virtual NS_HIDDEN_(void) ClearFrameRefs(nsIFrame* aFrame) = 0; + virtual void ClearFrameRefs(nsIFrame* aFrame) = 0; /** * Get a reference rendering context. This is a context that should not @@ -576,7 +576,7 @@ public: * the pres shell that there is no current target, and |aScroll| must * be false. */ - virtual NS_HIDDEN_(nsresult) GoToAnchor(const nsAString& aAnchorName, bool aScroll) = 0; + virtual nsresult GoToAnchor(const nsAString& aAnchorName, bool aScroll) = 0; /** * Tells the presshell to scroll again to the last anchor scrolled to by @@ -586,7 +586,7 @@ public: * scrolled to by GoToAnchor (we don't want to keep it alive if it's * removed from the DOM), so don't call this more than once. */ - virtual NS_HIDDEN_(nsresult) ScrollToAnchor() = 0; + virtual nsresult ScrollToAnchor() = 0; enum { SCROLL_TOP = 0, @@ -669,7 +669,7 @@ public: * nodes in this document, not in any parent documents which * contain this document in a iframe or the like. */ - virtual NS_HIDDEN_(nsresult) ScrollContentIntoView(nsIContent* aContent, + virtual nsresult ScrollContentIntoView(nsIContent* aContent, ScrollAxis aVertical, ScrollAxis aHorizontal, uint32_t aFlags) = 0; @@ -726,26 +726,26 @@ public: * Suppress notification of the frame manager that frames are * being destroyed. */ - virtual NS_HIDDEN_(void) SetIgnoreFrameDestruction(bool aIgnore) = 0; + virtual void SetIgnoreFrameDestruction(bool aIgnore) = 0; /** * Notification sent by a frame informing the pres shell that it is about to * be destroyed. * This allows any outstanding references to the frame to be cleaned up */ - virtual NS_HIDDEN_(void) NotifyDestroyingFrame(nsIFrame* aFrame) = 0; + virtual void NotifyDestroyingFrame(nsIFrame* aFrame) = 0; /** * Get the caret, if it exists. AddRefs it. */ - virtual NS_HIDDEN_(already_AddRefed) GetCaret() const = 0; + virtual already_AddRefed GetCaret() const = 0; /** * Invalidate the caret's current position if it's outside of its frame's * boundaries. This function is useful if you're batching selection * notifications and might remove the caret's frame out from under it. */ - virtual NS_HIDDEN_(void) MaybeInvalidateCaretPosition() = 0; + virtual void MaybeInvalidateCaretPosition() = 0; /** * Set the current caret to a new caret. To undo this, call RestoreCaret. @@ -781,7 +781,7 @@ public: * Interface to dispatch events via the presshell * @note The caller must have a strong reference to the PresShell. */ - virtual NS_HIDDEN_(nsresult) HandleEventWithTarget( + virtual nsresult HandleEventWithTarget( mozilla::WidgetEvent* aEvent, nsIFrame* aFrame, nsIContent* aContent, @@ -791,7 +791,7 @@ public: * Dispatch event to content only (NOT full processing) * @note The caller must have a strong reference to the PresShell. */ - virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget( + virtual nsresult HandleDOMEventWithTarget( nsIContent* aTargetContent, mozilla::WidgetEvent* aEvent, nsEventStatus* aStatus) = 0; @@ -800,26 +800,26 @@ public: * Dispatch event to content only (NOT full processing) * @note The caller must have a strong reference to the PresShell. */ - virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget(nsIContent* aTargetContent, + virtual nsresult HandleDOMEventWithTarget(nsIContent* aTargetContent, nsIDOMEvent* aEvent, nsEventStatus* aStatus) = 0; /** * Gets the current target event frame from the PresShell */ - virtual NS_HIDDEN_(nsIFrame*) GetEventTargetFrame() = 0; + virtual nsIFrame* GetEventTargetFrame() = 0; /** * Gets the current target event frame from the PresShell */ - virtual NS_HIDDEN_(already_AddRefed) GetEventTargetContent( + virtual already_AddRefed GetEventTargetContent( mozilla::WidgetEvent* aEvent) = 0; /** * Get and set the history state for the current document */ - virtual NS_HIDDEN_(nsresult) CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState) = 0; + virtual nsresult CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState) = 0; /** * Determine if reflow is currently locked @@ -851,7 +851,7 @@ public: /** * Unsuppress painting. */ - virtual NS_HIDDEN_(void) UnsuppressPainting() = 0; + virtual void UnsuppressPainting() = 0; /** * Called to disable nsITheme support in a specific presshell. @@ -915,15 +915,15 @@ public: virtual nsIFrame* GetAbsoluteContainingBlock(nsIFrame* aFrame); #ifdef MOZ_REFLOW_PERF - virtual NS_HIDDEN_(void) DumpReflows() = 0; - virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame) = 0; - virtual NS_HIDDEN_(void) PaintCount(const char * aName, + virtual void DumpReflows() = 0; + virtual void CountReflows(const char * aName, nsIFrame * aFrame) = 0; + virtual void PaintCount(const char * aName, nsRenderingContext* aRenderingContext, nsPresContext * aPresContext, nsIFrame * aFrame, const nsPoint& aOffset, uint32_t aColor) = 0; - virtual NS_HIDDEN_(void) SetPaintFrameCount(bool aOn) = 0; + virtual void SetPaintFrameCount(bool aOn) = 0; virtual bool IsPaintingFrameCounts() = 0; #endif @@ -1016,7 +1016,7 @@ public: RENDER_DOCUMENT_RELATIVE = 0x20, RENDER_DRAWWINDOW_NOT_FLUSHING = 0x40 }; - virtual NS_HIDDEN_(nsresult) RenderDocument(const nsRect& aRect, uint32_t aFlags, + virtual nsresult RenderDocument(const nsRect& aRect, uint32_t aFlags, nscolor aBackgroundColor, gfxContext* aRenderedContext) = 0; @@ -1087,7 +1087,7 @@ public: * @param aDisable If true, disable all non synthetic test mouse * events on all presShells. Otherwise, enable them. */ - virtual NS_HIDDEN_(void) DisableNonTestMouseEvents(bool aDisable) = 0; + virtual void DisableNonTestMouseEvents(bool aDisable) = 0; /** * Record the background color of the most recently drawn canvas. This color diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp index d16f1d55df8..e00b6cc4826 100644 --- a/layout/base/nsPresArena.cpp +++ b/layout/base/nsPresArena.cpp @@ -40,7 +40,7 @@ nsPresArena::~nsPresArena() PL_FinishArenaPool(&mPool); } -NS_HIDDEN_(void*) +void* nsPresArena::Allocate(uint32_t aCode, size_t aSize) { NS_ABORT_IF_FALSE(aSize > 0, "PresArena cannot allocate zero bytes"); @@ -98,7 +98,7 @@ nsPresArena::Allocate(uint32_t aCode, size_t aSize) return result; } -NS_HIDDEN_(void) +void nsPresArena::Free(uint32_t aCode, void* aPtr) { // Try to recycle this entry. diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h index 4b9c6362e58..e4926a88dbc 100644 --- a/layout/base/nsPresArena.h +++ b/layout/base/nsPresArena.h @@ -46,11 +46,11 @@ public: /** * Pool allocation with recycler lists indexed by object size, aSize. */ - NS_HIDDEN_(void*) AllocateBySize(size_t aSize) + void* AllocateBySize(size_t aSize) { return Allocate(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aSize); } - NS_HIDDEN_(void) FreeBySize(size_t aSize, void* aPtr) + void FreeBySize(size_t aSize, void* aPtr) { Free(uint32_t(aSize) | uint32_t(NON_OBJECT_MARKER), aPtr); } @@ -59,11 +59,11 @@ public: * Pool allocation with recycler lists indexed by frame-type ID. * Every aID must always be used with the same object size, aSize. */ - NS_HIDDEN_(void*) AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize) + void* AllocateByFrameID(nsQueryFrame::FrameIID aID, size_t aSize) { return Allocate(aID, aSize); } - NS_HIDDEN_(void) FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr) + void FreeByFrameID(nsQueryFrame::FrameIID aID, void* aPtr) { Free(aID, aPtr); } @@ -72,11 +72,11 @@ public: * Pool allocation with recycler lists indexed by object-type ID (see above). * Every aID must always be used with the same object size, aSize. */ - NS_HIDDEN_(void*) AllocateByObjectID(ObjectID aID, size_t aSize) + void* AllocateByObjectID(ObjectID aID, size_t aSize) { return Allocate(aID, aSize); } - NS_HIDDEN_(void) FreeByObjectID(ObjectID aID, void* aPtr) + void FreeByObjectID(ObjectID aID, void* aPtr) { Free(aID, aPtr); } @@ -89,8 +89,8 @@ public: nsArenaMemoryStats* aArenaStats); private: - NS_HIDDEN_(void*) Allocate(uint32_t aCode, size_t aSize); - NS_HIDDEN_(void) Free(uint32_t aCode, void* aPtr); + void* Allocate(uint32_t aCode, size_t aSize); + void Free(uint32_t aCode, void* aPtr); // All keys to this hash table fit in 32 bits (see below) so we do not // bother actually hashing them. diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index 2300bb846b3..428c554cc6b 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -160,16 +160,16 @@ public: /** * Initialize the presentation context from a particular device. */ - NS_HIDDEN_(nsresult) Init(nsDeviceContext* aDeviceContext); + nsresult Init(nsDeviceContext* aDeviceContext); /** * Set the presentation shell that this context is bound to. * A presentation context may only be bound to a single shell. */ - NS_HIDDEN_(void) SetShell(nsIPresShell* aShell); + void SetShell(nsIPresShell* aShell); - NS_HIDDEN_(nsPresContextType) Type() const { return mType; } + nsPresContextType Type() const { return mType; } /** * Get the PresentationShell that this context is bound to. @@ -260,7 +260,7 @@ public: void MediaFeatureValuesChanged(StyleRebuildType aShouldRebuild, nsChangeHint aChangeHint = nsChangeHint(0)); void PostMediaFeatureValuesChangedEvent(); - NS_HIDDEN_(void) HandleMediaFeatureValuesChangedEvent(); + void HandleMediaFeatureValuesChangedEvent(); void FlushPendingMediaFeatureValuesChanged() { if (mPendingMediaFeatureValuesChanged) MediaFeatureValuesChanged(eRebuildStyleIfNeeded); @@ -281,14 +281,14 @@ public: /** * Notify the context that the document's compatibility mode has changed */ - NS_HIDDEN_(void) CompatibilityModeChanged(); + void CompatibilityModeChanged(); /** * Access the image animation mode for this context */ uint16_t ImageAnimationMode() const { return mImageAnimationMode; } - virtual NS_HIDDEN_(void) SetImageAnimationModeExternal(uint16_t aMode); - NS_HIDDEN_(void) SetImageAnimationModeInternal(uint16_t aMode); + virtual void SetImageAnimationModeExternal(uint16_t aMode); + void SetImageAnimationModeInternal(uint16_t aMode); #ifdef MOZILLA_INTERNAL_API void SetImageAnimationMode(uint16_t aMode) { SetImageAnimationModeInternal(aMode); } @@ -350,7 +350,7 @@ public: * the user's preference for font size for that generic and the * given language. */ - NS_HIDDEN_(const nsFont*) GetDefaultFont(uint8_t aFontID, + const nsFont* GetDefaultFont(uint8_t aFontID, nsIAtom *aLanguage) const; /** Get a cached boolean pref, by its type */ @@ -413,7 +413,7 @@ public: bool GetFocusRingOnAnything() const { return mFocusRingOnAnything; } uint8_t GetFocusRingStyle() const { return mFocusRingStyle; } - NS_HIDDEN_(void) SetContainer(nsIDocShell* aContainer); + void SetContainer(nsIDocShell* aContainer); virtual nsISupports* GetContainerWeakExternal() const; nsISupports* GetContainerWeakInternal() const; @@ -471,7 +471,7 @@ public: * Sets whether the presentation context can scroll for a paginated * context. */ - NS_HIDDEN_(void) SetPaginatedScrolling(bool aResult); + void SetPaginatedScrolling(bool aResult); /** * Return true if this presentation context can scroll for paginated @@ -710,7 +710,7 @@ public: * * @lina 07/12/2000 */ - NS_HIDDEN_(void) SetBidiEnabled() const; + void SetBidiEnabled() const; /** * Set visual or implicit mode into the pres context. @@ -743,7 +743,7 @@ public: /** * Set the Bidi options for the presentation context */ - NS_HIDDEN_(void) SetBidi(uint32_t aBidiOptions, + void SetBidi(uint32_t aBidiOptions, bool aForceRestyle = false); /** @@ -751,7 +751,7 @@ public: * Not inline so consumers of nsPresContext are not forced to * include nsIDocument. */ - NS_HIDDEN_(uint32_t) GetBidi() const; + uint32_t GetBidi() const; /** * Render only Selection @@ -763,12 +763,12 @@ public: bool IsRenderingOnlySelection() const { return mIsRenderingOnlySelection; } - NS_HIDDEN_(bool) IsTopLevelWindowInactive(); + bool IsTopLevelWindowInactive(); /* * Obtain a native them for rendering our widgets (both form controls and html) */ - NS_HIDDEN_(nsITheme*) GetTheme(); + nsITheme* GetTheme(); /* * Notify the pres context that the theme has changed. An internal switch @@ -776,28 +776,28 @@ public: * Otherwise, the OS is telling us that the native theme for the platform * has changed. */ - NS_HIDDEN_(void) ThemeChanged(); + void ThemeChanged(); /* * Notify the pres context that the resolution of the user interface has * changed. This happens if a window is moved between HiDPI and non-HiDPI * displays, so that the ratio of points to device pixels changes. */ - NS_HIDDEN_(void) UIResolutionChanged(); + void UIResolutionChanged(); /** * Recursively notify all remote leaf descendants of a given message manager * that the resolution of the user interface has changed. */ - NS_HIDDEN_(void) NotifyUIResolutionChanged(nsIMessageBroadcaster* aManager); + void NotifyUIResolutionChanged(nsIMessageBroadcaster* aManager); /* * Notify the pres context that a system color has changed */ - NS_HIDDEN_(void) SysColorChanged(); + void SysColorChanged(); /** Printing methods below should only be used for Medium() == print **/ - NS_HIDDEN_(void) SetPrintSettings(nsIPrintSettings *aPrintSettings); + void SetPrintSettings(nsIPrintSettings *aPrintSettings); nsIPrintSettings* GetPrintSettings() { return mPrintSettings; } @@ -808,10 +808,10 @@ public: docshell if it's the most recent prescontext for the docshell. Returns whether the prescontext is now being shown. */ - NS_HIDDEN_(bool) EnsureVisible(); + bool EnsureVisible(); #ifdef MOZ_REFLOW_PERF - NS_HIDDEN_(void) CountReflows(const char * aName, + void CountReflows(const char * aName, nsIFrame * aFrame); #endif @@ -853,8 +853,8 @@ public: bool SupressingResizeReflow() const { return mSupressResizeReflow; } - virtual NS_HIDDEN_(gfxUserFontSet*) GetUserFontSetExternal(); - NS_HIDDEN_(gfxUserFontSet*) GetUserFontSetInternal(); + virtual gfxUserFontSet* GetUserFontSetExternal(); + gfxUserFontSet* GetUserFontSetInternal(); #ifdef MOZILLA_INTERNAL_API gfxUserFontSet* GetUserFontSet() { return GetUserFontSetInternal(); } #else @@ -1035,25 +1035,25 @@ public: protected: friend class nsRunnableMethod; - NS_HIDDEN_(void) ThemeChangedInternal(); - NS_HIDDEN_(void) SysColorChangedInternal(); - NS_HIDDEN_(void) UIResolutionChangedInternal(); + void ThemeChangedInternal(); + void SysColorChangedInternal(); + void UIResolutionChangedInternal(); - static NS_HIDDEN_(bool) + static bool UIResolutionChangedSubdocumentCallback(nsIDocument* aDocument, void* aData); - NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, uint16_t aMode); - NS_HIDDEN_(void) SetSMILAnimations(nsIDocument *aDoc, uint16_t aNewMode, + void SetImgAnimations(nsIContent *aParent, uint16_t aMode); + void SetSMILAnimations(nsIDocument *aDoc, uint16_t aNewMode, uint16_t aOldMode); - NS_HIDDEN_(void) GetDocumentColorPreferences(); + void GetDocumentColorPreferences(); - NS_HIDDEN_(void) PreferenceChanged(const char* aPrefName); - static NS_HIDDEN_(void) PrefChangedCallback(const char*, void*); + void PreferenceChanged(const char* aPrefName); + static void PrefChangedCallback(const char*, void*); - NS_HIDDEN_(void) UpdateAfterPreferencesChanged(); - static NS_HIDDEN_(void) PrefChangedUpdateTimerCallback(nsITimer *aTimer, void *aClosure); + void UpdateAfterPreferencesChanged(); + static void PrefChangedUpdateTimerCallback(nsITimer *aTimer, void *aClosure); - NS_HIDDEN_(void) GetUserPreferences(); + void GetUserPreferences(); // Allow nsAutoPtr dtor to access this protected struct's // dtor: @@ -1127,7 +1127,7 @@ protected: mLangGroupFontPrefs.mLangGroup = nullptr; } - NS_HIDDEN_(void) UpdateCharSet(const nsCString& aCharSet); + void UpdateCharSet(const nsCString& aCharSet); public: void DoChangeCharSet(const nsCString& aCharSet); diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h index d4803b8d8b1..460b7195a21 100644 --- a/layout/base/nsPresShell.h +++ b/layout/base/nsPresShell.h @@ -70,10 +70,10 @@ public: void Init(nsIDocument* aDocument, nsPresContext* aPresContext, nsViewManager* aViewManager, nsStyleSet* aStyleSet, nsCompatibility aCompatMode); - virtual NS_HIDDEN_(void) Destroy() MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) MakeZombie() MOZ_OVERRIDE; + virtual void Destroy() MOZ_OVERRIDE; + virtual void MakeZombie() MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) SetPreferenceStyleRules(bool aForceReflow) MOZ_OVERRIDE; + virtual nsresult SetPreferenceStyleRules(bool aForceReflow) MOZ_OVERRIDE; NS_IMETHOD GetSelection(SelectionType aType, nsISelection** aSelection); virtual mozilla::dom::Selection* GetCurrentSelection(SelectionType aType) MOZ_OVERRIDE; @@ -84,40 +84,40 @@ public: int16_t aFlags) MOZ_OVERRIDE; NS_IMETHOD RepaintSelection(SelectionType aType) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) BeginObservingDocument() MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) EndObservingDocument() MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) Initialize(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) ResizeReflow(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) ResizeReflowOverride(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsIPageSequenceFrame*) GetPageSequenceFrame() const MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsIFrame*) GetRealPrimaryFrameFor(nsIContent* aContent) const MOZ_OVERRIDE; + virtual void BeginObservingDocument() MOZ_OVERRIDE; + virtual void EndObservingDocument() MOZ_OVERRIDE; + virtual nsresult Initialize(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; + virtual nsresult ResizeReflow(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; + virtual nsresult ResizeReflowOverride(nscoord aWidth, nscoord aHeight) MOZ_OVERRIDE; + virtual nsIPageSequenceFrame* GetPageSequenceFrame() const MOZ_OVERRIDE; + virtual nsIFrame* GetRealPrimaryFrameFor(nsIContent* aContent) const MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsIFrame*) GetPlaceholderFrameFor(nsIFrame* aFrame) const MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty, + virtual nsIFrame* GetPlaceholderFrameFor(nsIFrame* aFrame) const MOZ_OVERRIDE; + virtual void FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty, nsFrameState aBitToAdd) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) FrameNeedsToContinueReflow(nsIFrame *aFrame) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) CancelAllPendingReflows() MOZ_OVERRIDE; - virtual NS_HIDDEN_(bool) IsSafeToFlush() const MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) FlushPendingNotifications(mozilla::ChangesToFlush aType) MOZ_OVERRIDE; + virtual void FrameNeedsToContinueReflow(nsIFrame *aFrame) MOZ_OVERRIDE; + virtual void CancelAllPendingReflows() MOZ_OVERRIDE; + virtual bool IsSafeToFlush() const MOZ_OVERRIDE; + virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE; + virtual void FlushPendingNotifications(mozilla::ChangesToFlush aType) MOZ_OVERRIDE; /** * Recreates the frames for a node */ - virtual NS_HIDDEN_(nsresult) RecreateFramesFor(nsIContent* aContent) MOZ_OVERRIDE; + virtual nsresult RecreateFramesFor(nsIContent* aContent) MOZ_OVERRIDE; /** * Post a callback that should be handled after reflow has finished. */ - virtual NS_HIDDEN_(nsresult) PostReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) CancelReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE; + virtual nsresult PostReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE; + virtual void CancelReflowCallback(nsIReflowCallback* aCallback) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) ClearFrameRefs(nsIFrame* aFrame) MOZ_OVERRIDE; - virtual NS_HIDDEN_(already_AddRefed) CreateReferenceRenderingContext(); - virtual NS_HIDDEN_(nsresult) GoToAnchor(const nsAString& aAnchorName, bool aScroll) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) ScrollToAnchor() MOZ_OVERRIDE; + virtual void ClearFrameRefs(nsIFrame* aFrame) MOZ_OVERRIDE; + virtual already_AddRefed CreateReferenceRenderingContext(); + virtual nsresult GoToAnchor(const nsAString& aAnchorName, bool aScroll) MOZ_OVERRIDE; + virtual nsresult ScrollToAnchor() MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) ScrollContentIntoView(nsIContent* aContent, + virtual nsresult ScrollContentIntoView(nsIContent* aContent, ScrollAxis aVertical, ScrollAxis aHorizontal, uint32_t aFlags) MOZ_OVERRIDE; @@ -130,12 +130,12 @@ public: const nsRect &aRect, nscoord aMinTwips) const MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) SetIgnoreFrameDestruction(bool aIgnore) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) NotifyDestroyingFrame(nsIFrame* aFrame) MOZ_OVERRIDE; + virtual void SetIgnoreFrameDestruction(bool aIgnore) MOZ_OVERRIDE; + virtual void NotifyDestroyingFrame(nsIFrame* aFrame) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState) MOZ_OVERRIDE; + virtual nsresult CaptureHistoryState(nsILayoutHistoryState** aLayoutHistoryState) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) UnsuppressPainting() MOZ_OVERRIDE; + virtual void UnsuppressPainting() MOZ_OVERRIDE; virtual nsresult GetAgentStyleSheets(nsCOMArray& aSheets) MOZ_OVERRIDE; virtual nsresult SetAgentStyleSheets(const nsCOMArray& aSheets) MOZ_OVERRIDE; @@ -143,13 +143,13 @@ public: virtual nsresult AddOverrideStyleSheet(nsIStyleSheet *aSheet) MOZ_OVERRIDE; virtual nsresult RemoveOverrideStyleSheet(nsIStyleSheet *aSheet) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) HandleEventWithTarget( + virtual nsresult HandleEventWithTarget( mozilla::WidgetEvent* aEvent, nsIFrame* aFrame, nsIContent* aContent, nsEventStatus* aStatus) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsIFrame*) GetEventTargetFrame() MOZ_OVERRIDE; - virtual NS_HIDDEN_(already_AddRefed) GetEventTargetContent( + virtual nsIFrame* GetEventTargetFrame() MOZ_OVERRIDE; + virtual already_AddRefed GetEventTargetContent( mozilla::WidgetEvent* aEvent) MOZ_OVERRIDE; @@ -158,7 +158,7 @@ public: virtual void Thaw() MOZ_OVERRIDE; virtual void FireOrClearDelayedEvents(bool aFireEvents) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) RenderDocument(const nsRect& aRect, uint32_t aFlags, + virtual nsresult RenderDocument(const nsRect& aRect, uint32_t aFlags, nscolor aBackgroundColor, gfxContext* aThebesContext) MOZ_OVERRIDE; @@ -190,11 +190,11 @@ public: mozilla::WidgetGUIEvent* aEvent, bool aDontRetargetEvents, nsEventStatus* aEventStatus) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget( + virtual nsresult HandleDOMEventWithTarget( nsIContent* aTargetContent, mozilla::WidgetEvent* aEvent, nsEventStatus* aStatus) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) HandleDOMEventWithTarget(nsIContent* aTargetContent, + virtual nsresult HandleDOMEventWithTarget(nsIContent* aTargetContent, nsIDOMEvent* aEvent, nsEventStatus* aStatus) MOZ_OVERRIDE; virtual bool ShouldIgnoreInvalidation() MOZ_OVERRIDE; @@ -208,8 +208,8 @@ public: virtual bool IsVisible() MOZ_OVERRIDE; // caret handling - virtual NS_HIDDEN_(already_AddRefed) GetCaret() const MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) MaybeInvalidateCaretPosition() MOZ_OVERRIDE; + virtual already_AddRefed GetCaret() const MOZ_OVERRIDE; + virtual void MaybeInvalidateCaretPosition() MOZ_OVERRIDE; NS_IMETHOD SetCaretEnabled(bool aInEnable) MOZ_OVERRIDE; NS_IMETHOD SetCaretReadOnly(bool aReadOnly) MOZ_OVERRIDE; NS_IMETHOD GetCaretEnabled(bool *aOutEnabled) MOZ_OVERRIDE; @@ -267,15 +267,15 @@ public: NS_DECL_NSIOBSERVER #ifdef MOZ_REFLOW_PERF - virtual NS_HIDDEN_(void) DumpReflows() MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) CountReflows(const char * aName, nsIFrame * aFrame) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) PaintCount(const char * aName, + virtual void DumpReflows() MOZ_OVERRIDE; + virtual void CountReflows(const char * aName, nsIFrame * aFrame) MOZ_OVERRIDE; + virtual void PaintCount(const char * aName, nsRenderingContext* aRenderingContext, nsPresContext* aPresContext, nsIFrame * aFrame, const nsPoint& aOffset, uint32_t aColor) MOZ_OVERRIDE; - virtual NS_HIDDEN_(void) SetPaintFrameCount(bool aOn) MOZ_OVERRIDE; + virtual void SetPaintFrameCount(bool aOn) MOZ_OVERRIDE; virtual bool IsPaintingFrameCounts() MOZ_OVERRIDE; #endif @@ -291,7 +291,7 @@ public: static PRLogModuleInfo* gLog; #endif - virtual NS_HIDDEN_(void) DisableNonTestMouseEvents(bool aDisable) MOZ_OVERRIDE; + virtual void DisableNonTestMouseEvents(bool aDisable) MOZ_OVERRIDE; virtual void UpdateCanvasBackground() MOZ_OVERRIDE; @@ -309,7 +309,7 @@ public: virtual nscolor ComputeBackstopColor(nsView* aDisplayRoot) MOZ_OVERRIDE; - virtual NS_HIDDEN_(nsresult) SetIsActive(bool aIsActive) MOZ_OVERRIDE; + virtual nsresult SetIsActive(bool aIsActive) MOZ_OVERRIDE; virtual bool GetIsViewportOverridden() MOZ_OVERRIDE { return mViewportOverridden; } diff --git a/layout/base/nsStyleSheetService.h b/layout/base/nsStyleSheetService.h index ddf3d4a4097..05d8139e226 100644 --- a/layout/base/nsStyleSheetService.h +++ b/layout/base/nsStyleSheetService.h @@ -39,7 +39,7 @@ class nsStyleSheetService MOZ_FINAL NS_DECL_NSISTYLESHEETSERVICE NS_DECL_NSIMEMORYREPORTER - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); nsCOMArray* AgentStyleSheets() { return &mSheets[AGENT_SHEET]; } nsCOMArray* UserStyleSheets() { return &mSheets[USER_SHEET]; } @@ -52,17 +52,17 @@ class nsStyleSheetService MOZ_FINAL private: - NS_HIDDEN_(void) RegisterFromEnumerator(nsICategoryManager *aManager, + void RegisterFromEnumerator(nsICategoryManager *aManager, const char *aCategory, nsISimpleEnumerator *aEnumerator, uint32_t aSheetType); - NS_HIDDEN_(int32_t) FindSheetByURI(const nsCOMArray &sheets, + int32_t FindSheetByURI(const nsCOMArray &sheets, nsIURI *sheetURI); // Like LoadAndRegisterSheet, but doesn't notify. If successful, the // new sheet will be the last sheet in mSheets[aSheetType]. - NS_HIDDEN_(nsresult) LoadAndRegisterSheetInternal(nsIURI *aSheetURI, + nsresult LoadAndRegisterSheetInternal(nsIURI *aSheetURI, uint32_t aSheetType); nsCOMArray mSheets[3]; diff --git a/layout/forms/nsFieldSetFrame.h b/layout/forms/nsFieldSetFrame.h index 2e3d1977437..ff94e65aef9 100644 --- a/layout/forms/nsFieldSetFrame.h +++ b/layout/forms/nsFieldSetFrame.h @@ -16,7 +16,7 @@ public: nsFieldSetFrame(nsStyleContext* aContext); - NS_HIDDEN_(nscoord) + nscoord GetIntrinsicWidth(nsRenderingContext* aRenderingContext, nsLayoutUtils::IntrinsicWidthType); virtual nscoord GetMinWidth(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE; diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 668f3202246..012311f4b24 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -2653,7 +2653,7 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty())) // convenience. virtual void SetBounds(nsBoxLayoutState& aBoxLayoutState, const nsRect& aRect, bool aRemoveOverflowAreas = false) = 0; - NS_HIDDEN_(nsresult) Layout(nsBoxLayoutState& aBoxLayoutState); + nsresult Layout(nsBoxLayoutState& aBoxLayoutState); // Box methods. Note that these do NOT just get the CSS border, padding, // etc. They also talk to nsITheme. virtual nsresult GetBorderAndPadding(nsMargin& aBorderAndPadding); @@ -2662,7 +2662,7 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty())) virtual nsresult GetMargin(nsMargin& aMargin)=0; virtual void SetLayoutManager(nsBoxLayout* aLayout) { } virtual nsBoxLayout* GetLayoutManager() { return nullptr; } - NS_HIDDEN_(nsresult) GetClientRect(nsRect& aContentRect); + nsresult GetClientRect(nsRect& aContentRect); // For nsSprocketLayout virtual Valignment GetVAlign() const = 0; @@ -2671,7 +2671,7 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty())) bool IsHorizontal() const { return (mState & NS_STATE_IS_HORIZONTAL) != 0; } bool IsNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; } - NS_HIDDEN_(nsresult) Redraw(nsBoxLayoutState& aState); + nsresult Redraw(nsBoxLayoutState& aState); virtual nsresult RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)=0; // XXX take this out after we've branched virtual bool GetMouseThrough() const { return false; } diff --git a/layout/xul/nsBox.h b/layout/xul/nsBox.h index bedeb26f59e..d8e523b0b1c 100644 --- a/layout/xul/nsBox.h +++ b/layout/xul/nsBox.h @@ -47,7 +47,7 @@ public: virtual nsresult SetDebug(nsBoxLayoutState& aState, bool aDebug) MOZ_OVERRIDE; virtual nsresult DumpBox(FILE* out) MOZ_OVERRIDE; - NS_HIDDEN_(void) PropagateDebug(nsBoxLayoutState& aState); + void PropagateDebug(nsBoxLayoutState& aState); #endif nsBox(); @@ -60,7 +60,7 @@ rollbox. virtual bool DoesClipChildren(); virtual bool ComputesOwnOverflowArea() = 0; - NS_HIDDEN_(nsresult) SyncLayout(nsBoxLayoutState& aBoxLayoutState); + nsresult SyncLayout(nsBoxLayoutState& aBoxLayoutState); bool DoesNeedRecalc(const nsSize& aSize); bool DoesNeedRecalc(nscoord aCoord); @@ -91,13 +91,13 @@ protected: virtual void GetLayoutFlags(uint32_t& aFlags); - NS_HIDDEN_(nsresult) BeginLayout(nsBoxLayoutState& aState); + nsresult BeginLayout(nsBoxLayoutState& aState); NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState); - NS_HIDDEN_(nsresult) EndLayout(nsBoxLayoutState& aState); + nsresult EndLayout(nsBoxLayoutState& aState); #ifdef DEBUG_LAYOUT virtual void GetBoxName(nsAutoString& aName); - NS_HIDDEN_(void) PropagateDebug(nsBoxLayoutState& aState); + void PropagateDebug(nsBoxLayoutState& aState); #endif static bool gGotTheme; diff --git a/layout/xul/nsBoxFrame.h b/layout/xul/nsBoxFrame.h index 0ab15207dad..9a3b92770ad 100644 --- a/layout/xul/nsBoxFrame.h +++ b/layout/xul/nsBoxFrame.h @@ -205,7 +205,7 @@ protected: protected: void RegUnregAccessKey(bool aDoReg); - NS_HIDDEN_(void) CheckBoxOrder(); + void CheckBoxOrder(); private: diff --git a/layout/xul/nsMenuFrame.h b/layout/xul/nsMenuFrame.h index f46c1e758e9..17835d67751 100644 --- a/layout/xul/nsMenuFrame.h +++ b/layout/xul/nsMenuFrame.h @@ -266,7 +266,7 @@ protected: #ifdef DEBUG_LAYOUT nsresult SetDebug(nsBoxLayoutState& aState, nsIFrame* aList, bool aDebug); #endif - NS_HIDDEN_(nsresult) Notify(nsITimer* aTimer); + nsresult Notify(nsITimer* aTimer); bool mIsMenu; // Whether or not we can even have children or not. bool mChecked; // are we checked? diff --git a/modules/libjar/zipwriter/src/StreamFunctions.cpp b/modules/libjar/zipwriter/src/StreamFunctions.cpp index 2e075ddad3e..9a38f2dcaec 100644 --- a/modules/libjar/zipwriter/src/StreamFunctions.cpp +++ b/modules/libjar/zipwriter/src/StreamFunctions.cpp @@ -11,7 +11,7 @@ * Fully reads the required amount of data. Keeps reading until all the * data is retrieved or an error is hit. */ -NS_HIDDEN_(nsresult) ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_t aCount) +nsresult ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_t aCount) { while (aCount > 0) { uint32_t read; @@ -31,7 +31,7 @@ NS_HIDDEN_(nsresult) ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_ * Fully writes the required amount of data. Keeps writing until all the * data is written or an error is hit. */ -NS_HIDDEN_(nsresult) ZW_WriteData(nsIOutputStream *aStream, const char *aBuffer, +nsresult ZW_WriteData(nsIOutputStream *aStream, const char *aBuffer, uint32_t aCount) { while (aCount > 0) { diff --git a/modules/libjar/zipwriter/src/StreamFunctions.h b/modules/libjar/zipwriter/src/StreamFunctions.h index 0776d969d82..012fce986d3 100644 --- a/modules/libjar/zipwriter/src/StreamFunctions.h +++ b/modules/libjar/zipwriter/src/StreamFunctions.h @@ -16,43 +16,43 @@ * The off argument, where present, is incremented according to the number of * bytes consumed from the buffer. */ -inline NS_HIDDEN_(void) WRITE8(uint8_t* buf, uint32_t* off, uint8_t val) +inline void WRITE8(uint8_t* buf, uint32_t* off, uint8_t val) { buf[(*off)++] = val; } -inline NS_HIDDEN_(void) WRITE16(uint8_t* buf, uint32_t* off, uint16_t val) +inline void WRITE16(uint8_t* buf, uint32_t* off, uint16_t val) { WRITE8(buf, off, val & 0xff); WRITE8(buf, off, (val >> 8) & 0xff); } -inline NS_HIDDEN_(void) WRITE32(uint8_t* buf, uint32_t* off, uint32_t val) +inline void WRITE32(uint8_t* buf, uint32_t* off, uint32_t val) { WRITE16(buf, off, val & 0xffff); WRITE16(buf, off, (val >> 16) & 0xffff); } -inline NS_HIDDEN_(uint8_t) READ8(const uint8_t* buf, uint32_t* off) +inline uint8_t READ8(const uint8_t* buf, uint32_t* off) { return buf[(*off)++]; } -inline NS_HIDDEN_(uint16_t) READ16(const uint8_t* buf, uint32_t* off) +inline uint16_t READ16(const uint8_t* buf, uint32_t* off) { uint16_t val = READ8(buf, off); val |= READ8(buf, off) << 8; return val; } -inline NS_HIDDEN_(uint32_t) READ32(const uint8_t* buf, uint32_t* off) +inline uint32_t READ32(const uint8_t* buf, uint32_t* off) { uint32_t val = READ16(buf, off); val |= READ16(buf, off) << 16; return val; } -inline NS_HIDDEN_(uint32_t) PEEK32(const uint8_t* buf) +inline uint32_t PEEK32(const uint8_t* buf) { return (uint32_t)( (buf [0] ) | (buf [1] << 8) | @@ -60,9 +60,9 @@ inline NS_HIDDEN_(uint32_t) PEEK32(const uint8_t* buf) (buf [3] << 24) ); } -NS_HIDDEN_(nsresult) ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_t aCount); +nsresult ZW_ReadData(nsIInputStream *aStream, char *aBuffer, uint32_t aCount); -NS_HIDDEN_(nsresult) ZW_WriteData(nsIOutputStream *aStream, const char *aBuffer, +nsresult ZW_WriteData(nsIOutputStream *aStream, const char *aBuffer, uint32_t aCount); #endif diff --git a/netwerk/base/public/nsNetStrings.h b/netwerk/base/public/nsNetStrings.h index 415e563f1fe..653c34dc3f7 100644 --- a/netwerk/base/public/nsNetStrings.h +++ b/netwerk/base/public/nsNetStrings.h @@ -18,7 +18,7 @@ public: const nsLiteralString kChannelPolicy; }; -extern NS_HIDDEN_(nsNetStrings*) gNetStrings; +extern nsNetStrings* gNetStrings; #endif diff --git a/netwerk/base/public/nsNetUtil.h b/netwerk/base/public/nsNetUtil.h index 56056454b63..746960927dc 100644 --- a/netwerk/base/public/nsNetUtil.h +++ b/netwerk/base/public/nsNetUtil.h @@ -2346,8 +2346,8 @@ NS_SniffContent(const char* aSnifferType, nsIRequest* aRequest, nsACString& aSniffedType) { typedef nsCategoryCache ContentSnifferCache; - extern NS_HIDDEN_(ContentSnifferCache*) gNetSniffers; - extern NS_HIDDEN_(ContentSnifferCache*) gDataSniffers; + extern ContentSnifferCache* gNetSniffers; + extern ContentSnifferCache* gDataSniffers; ContentSnifferCache* cache = nullptr; if (!strcmp(aSnifferType, NS_CONTENT_SNIFFER_CATEGORY)) { if (!gNetSniffers) { diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h index f2a847c6755..d61b52bc402 100644 --- a/netwerk/base/src/nsIOService.h +++ b/netwerk/base/src/nsIOService.h @@ -56,8 +56,8 @@ public: // Returns an addrefed pointer. static nsIOService* GetInstance(); - NS_HIDDEN_(nsresult) Init(); - NS_HIDDEN_(nsresult) NewURI(const char* aSpec, nsIURI* aBaseURI, + nsresult Init(); + nsresult NewURI(const char* aSpec, nsIURI* aBaseURI, nsIURI* *result, nsIProtocolHandler* *hdlrResult); @@ -81,19 +81,19 @@ private: nsIOService() NS_HIDDEN; ~nsIOService() NS_HIDDEN; - NS_HIDDEN_(nsresult) TrackNetworkLinkStatusForOffline(); + nsresult TrackNetworkLinkStatusForOffline(); - NS_HIDDEN_(nsresult) GetCachedProtocolHandler(const char *scheme, + nsresult GetCachedProtocolHandler(const char *scheme, nsIProtocolHandler* *hdlrResult, uint32_t start=0, uint32_t end=0); - NS_HIDDEN_(nsresult) CacheProtocolHandler(const char *scheme, + nsresult CacheProtocolHandler(const char *scheme, nsIProtocolHandler* hdlr); // Prefs wrangling - NS_HIDDEN_(void) PrefsChanged(nsIPrefBranch *prefs, const char *pref = nullptr); - NS_HIDDEN_(void) GetPrefBranch(nsIPrefBranch **); - NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, bool remove); + void PrefsChanged(nsIPrefBranch *prefs, const char *pref = nullptr); + void GetPrefBranch(nsIPrefBranch **); + void ParsePortList(nsIPrefBranch *prefBranch, const char *pref, bool remove); nsresult InitializeSocketTransportService(); nsresult InitializeNetworkLinkService(); diff --git a/netwerk/base/src/nsInputStreamPump.h b/netwerk/base/src/nsInputStreamPump.h index 6b16ea8c69d..9e8bed0b220 100644 --- a/netwerk/base/src/nsInputStreamPump.h +++ b/netwerk/base/src/nsInputStreamPump.h @@ -32,7 +32,7 @@ public: nsInputStreamPump(); ~nsInputStreamPump(); - static NS_HIDDEN_(nsresult) + static nsresult Create(nsInputStreamPump **result, nsIInputStream *stream, int64_t streamPos = -1, @@ -53,7 +53,7 @@ public: * * Do not call before asyncRead. Do not call after onStopRequest. */ - NS_HIDDEN_(nsresult) PeekStream(PeekSegmentFun callback, void *closure); + nsresult PeekStream(PeekSegmentFun callback, void *closure); /** * Dispatched (to the main thread) by OnStateStop if it's called off main diff --git a/netwerk/base/src/nsNetStrings.cpp b/netwerk/base/src/nsNetStrings.cpp index 2227a639872..cd3ebfac303 100644 --- a/netwerk/base/src/nsNetStrings.cpp +++ b/netwerk/base/src/nsNetStrings.cpp @@ -5,7 +5,7 @@ #include "nsNetStrings.h" #include "nsChannelProperties.h" -NS_HIDDEN_(nsNetStrings*) gNetStrings; +nsNetStrings* gNetStrings; nsNetStrings::nsNetStrings() : NS_LITERAL_STRING_INIT(kChannelPolicy, NS_CHANNEL_PROP_CHANNEL_POLICY_STR) diff --git a/netwerk/base/src/nsPACMan.h b/netwerk/base/src/nsPACMan.h index f2a64ac2271..c8b0a70622a 100644 --- a/netwerk/base/src/nsPACMan.h +++ b/netwerk/base/src/nsPACMan.h @@ -149,7 +149,7 @@ public: return IsPACURI(tmp); } - NS_HIDDEN_(nsresult) Init(nsISystemProxySettings *); + nsresult Init(nsISystemProxySettings *); static nsPACMan *sInstance; // PAC thread operations only diff --git a/netwerk/base/src/nsProtocolProxyService.h b/netwerk/base/src/nsProtocolProxyService.h index 2ec6cde81c3..762d6a80a53 100644 --- a/netwerk/base/src/nsProtocolProxyService.h +++ b/netwerk/base/src/nsProtocolProxyService.h @@ -38,7 +38,7 @@ public: nsProtocolProxyService() NS_HIDDEN; - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); protected: friend class nsAsyncResolveRequest; @@ -55,7 +55,7 @@ protected: * This can be the name of a fully-qualified preference, or it can * be null, in which case all preferences will be initialized. */ - NS_HIDDEN_(void) PrefsChanged(nsIPrefBranch *prefs, const char *name); + void PrefsChanged(nsIPrefBranch *prefs, const char *name); /** * This method is called to create a nsProxyInfo instance from the given @@ -73,7 +73,7 @@ protected: * * @return A pointer beyond the parsed proxy string (never null). */ - NS_HIDDEN_(const char *) ExtractProxyInfo(const char *proxy, + const char * ExtractProxyInfo(const char *proxy, uint32_t aResolveFlags, nsProxyInfo **result); @@ -83,7 +83,7 @@ protected: * @param pacURI * The URI spec of the PAC file to load. */ - NS_HIDDEN_(nsresult) ConfigureFromPAC(const nsCString &pacURI, bool forceReload); + nsresult ConfigureFromPAC(const nsCString &pacURI, bool forceReload); /** * This method builds a list of nsProxyInfo objects from the given PAC- @@ -97,7 +97,7 @@ protected: * @param result * The resulting list of proxy info objects. */ - NS_HIDDEN_(void) ProcessPACString(const nsCString &pacString, + void ProcessPACString(const nsCString &pacString, uint32_t aResolveFlags, nsIProxyInfo **result); @@ -110,12 +110,12 @@ protected: * @param result * Upon return, this parameter holds the generated key. */ - NS_HIDDEN_(void) GetProxyKey(nsProxyInfo *pi, nsCString &result); + void GetProxyKey(nsProxyInfo *pi, nsCString &result); /** * @return Seconds since start of session. */ - NS_HIDDEN_(uint32_t) SecondsSinceSessionStart(); + uint32_t SecondsSinceSessionStart(); /** * This method removes the specified proxy from the disabled list. @@ -123,7 +123,7 @@ protected: * @param pi * The nsProxyInfo object identifying the proxy to enable. */ - NS_HIDDEN_(void) EnableProxy(nsProxyInfo *pi); + void EnableProxy(nsProxyInfo *pi); /** * This method adds the specified proxy to the disabled list. @@ -131,7 +131,7 @@ protected: * @param pi * The nsProxyInfo object identifying the proxy to disable. */ - NS_HIDDEN_(void) DisableProxy(nsProxyInfo *pi); + void DisableProxy(nsProxyInfo *pi); /** * This method tests to see if the given proxy is disabled. @@ -141,7 +141,7 @@ protected: * * @return True if the specified proxy is disabled. */ - NS_HIDDEN_(bool) IsProxyDisabled(nsProxyInfo *pi); + bool IsProxyDisabled(nsProxyInfo *pi); /** * This method queries the protocol handler for the given scheme to check @@ -154,7 +154,7 @@ protected: * of structure when you call this method. This parameter must not * be null. */ - NS_HIDDEN_(nsresult) GetProtocolInfo(nsIURI *uri, nsProtocolInfo *result); + nsresult GetProtocolInfo(nsIURI *uri, nsProtocolInfo *result); /** * This method is an internal version nsIProtocolProxyService::newProxyInfo @@ -177,7 +177,7 @@ protected: * @param result * The resulting nsIProxyInfo object. */ - NS_HIDDEN_(nsresult) NewProxyInfo_Internal(const char *type, + nsresult NewProxyInfo_Internal(const char *type, const nsACString &host, int32_t port, uint32_t flags, @@ -204,7 +204,7 @@ protected: * @param result * The resulting proxy info or null. */ - NS_HIDDEN_(nsresult) Resolve_Internal(nsIURI *uri, + nsresult Resolve_Internal(nsIURI *uri, const nsProtocolInfo &info, uint32_t flags, bool *usePAC, @@ -221,7 +221,7 @@ protected: * @param proxyInfo * The proxy info list to be modified. This is an inout param. */ - NS_HIDDEN_(void) ApplyFilters(nsIURI *uri, const nsProtocolInfo &info, + void ApplyFilters(nsIURI *uri, const nsProtocolInfo &info, nsIProxyInfo **proxyInfo); /** @@ -246,7 +246,7 @@ protected: * @param proxyInfo * The proxy info list to be modified. This is an inout param. */ - NS_HIDDEN_(void) PruneProxyInfo(const nsProtocolInfo &info, + void PruneProxyInfo(const nsProtocolInfo &info, nsIProxyInfo **proxyInfo); /** @@ -255,7 +255,7 @@ protected: * @param hostFilters * A "no-proxy-for" exclusion list. */ - NS_HIDDEN_(void) LoadHostFilters(const char *hostFilters); + void LoadHostFilters(const char *hostFilters); /** * This method checks the given URI against mHostFiltersArray. @@ -267,7 +267,7 @@ protected: * * @return True if the URI can use the specified proxy. */ - NS_HIDDEN_(bool) CanUseProxy(nsIURI *uri, int32_t defaultPort); + bool CanUseProxy(nsIURI *uri, int32_t defaultPort); /** * Disable Prefetch in the DNS service if a proxy is in use. @@ -275,7 +275,7 @@ protected: * @param aProxy * The proxy information */ - NS_HIDDEN_(void) MaybeDisableDNSPrefetch(nsIProxyInfo *aProxy); + void MaybeDisableDNSPrefetch(nsIProxyInfo *aProxy); private: nsresult SetupPACThread(); diff --git a/netwerk/base/src/nsTransportUtils.h b/netwerk/base/src/nsTransportUtils.h index 8cd389750ef..7f85dbeb4c7 100644 --- a/netwerk/base/src/nsTransportUtils.h +++ b/netwerk/base/src/nsTransportUtils.h @@ -20,7 +20,7 @@ * events can help prevent a backlog of unprocessed transport events in the * case that the target thread is overworked. */ -NS_HIDDEN_(nsresult) +nsresult net_NewTransportEventSinkProxy(nsITransportEventSink **aResult, nsITransportEventSink *aSink, nsIEventTarget *aTarget, diff --git a/netwerk/base/src/nsURLHelper.h b/netwerk/base/src/nsURLHelper.h index c84391f6452..816a3c57f2a 100644 --- a/netwerk/base/src/nsURLHelper.h +++ b/netwerk/base/src/nsURLHelper.h @@ -34,33 +34,33 @@ enum netCoalesceFlags //---------------------------------------------------------------------------- /* shutdown frees URL parser */ -NS_HIDDEN_(void) net_ShutdownURLHelper(); +void net_ShutdownURLHelper(); #ifdef XP_MACOSX -NS_HIDDEN_(void) net_ShutdownURLHelperOSX(); +void net_ShutdownURLHelperOSX(); #endif /* access URL parsers */ -NS_HIDDEN_(nsIURLParser *) net_GetAuthURLParser(); -NS_HIDDEN_(nsIURLParser *) net_GetNoAuthURLParser(); -NS_HIDDEN_(nsIURLParser *) net_GetStdURLParser(); +nsIURLParser * net_GetAuthURLParser(); +nsIURLParser * net_GetNoAuthURLParser(); +nsIURLParser * net_GetStdURLParser(); /* convert between nsIFile and file:// URL spec * net_GetURLSpecFromFile does an extra stat, so callers should * avoid it if possible in favor of net_GetURLSpecFromActualFile * and net_GetURLSpecFromDir */ -NS_HIDDEN_(nsresult) net_GetURLSpecFromFile(nsIFile *, nsACString &); -NS_HIDDEN_(nsresult) net_GetURLSpecFromDir(nsIFile *, nsACString &); -NS_HIDDEN_(nsresult) net_GetURLSpecFromActualFile(nsIFile *, nsACString &); -NS_HIDDEN_(nsresult) net_GetFileFromURLSpec(const nsACString &, nsIFile **); +nsresult net_GetURLSpecFromFile(nsIFile *, nsACString &); +nsresult net_GetURLSpecFromDir(nsIFile *, nsACString &); +nsresult net_GetURLSpecFromActualFile(nsIFile *, nsACString &); +nsresult net_GetFileFromURLSpec(const nsACString &, nsIFile **); /* extract file path components from file:// URL */ -NS_HIDDEN_(nsresult) net_ParseFileURL(const nsACString &inURL, +nsresult net_ParseFileURL(const nsACString &inURL, nsACString &outDirectory, nsACString &outFileBaseName, nsACString &outFileExtension); /* handle .. in dirs while resolving URLs (path is UTF-8) */ -NS_HIDDEN_(void) net_CoalesceDirs(netCoalesceFlags flags, char* path); +void net_CoalesceDirs(netCoalesceFlags flags, char* path); /** * Resolves a relative path string containing "." and ".." @@ -75,7 +75,7 @@ NS_HIDDEN_(void) net_CoalesceDirs(netCoalesceFlags flags, char* path); * * @return a new string, representing canonical uri */ -NS_HIDDEN_(nsresult) net_ResolveRelativePath(const nsACString &relativePath, +nsresult net_ResolveRelativePath(const nsACString &relativePath, const nsACString &basePath, nsACString &result); @@ -87,13 +87,13 @@ NS_HIDDEN_(nsresult) net_ResolveRelativePath(const nsACString &relativePath, * @param endPos end of scheme; index of colon (may be null) * @param scheme scheme copied to this buffer on return (may be null) */ -NS_HIDDEN_(nsresult) net_ExtractURLScheme(const nsACString &inURI, +nsresult net_ExtractURLScheme(const nsACString &inURI, uint32_t *startPos, uint32_t *endPos, nsACString *scheme = nullptr); /* check that the given scheme conforms to RFC 2396 */ -NS_HIDDEN_(bool) net_IsValidScheme(const char *scheme, uint32_t schemeLen); +bool net_IsValidScheme(const char *scheme, uint32_t schemeLen); inline bool net_IsValidScheme(const nsAFlatCString &scheme) { @@ -116,7 +116,7 @@ inline bool net_IsValidScheme(const nsAFlatCString &scheme) * @param result the out param to write to if filtering happens * @return whether result was written to */ -NS_HIDDEN_(bool) net_FilterURIString(const char *str, nsACString& result); +bool net_FilterURIString(const char *str, nsACString& result); #if defined(XP_WIN) /** @@ -132,7 +132,7 @@ NS_HIDDEN_(bool) net_FilterURIString(const char *str, nsACString& result); * * @returns false if aURL is already normalized. Otherwise, returns true. */ -NS_HIDDEN_(bool) net_NormalizeFileURL(const nsACString &aURL, +bool net_NormalizeFileURL(const nsACString &aURL, nsCString &aResultBuf); #endif @@ -141,15 +141,15 @@ NS_HIDDEN_(bool) net_NormalizeFileURL(const nsACString &aURL, */ /* convert to lower case */ -NS_HIDDEN_(void) net_ToLowerCase(char* str, uint32_t length); -NS_HIDDEN_(void) net_ToLowerCase(char* str); +void net_ToLowerCase(char* str, uint32_t length); +void net_ToLowerCase(char* str); /** * returns pointer to first character of |str| in the given set. if not found, * then |end| is returned. stops prematurely if a null byte is encountered, * and returns the address of the null byte. */ -NS_HIDDEN_(char *) net_FindCharInSet(const char *str, const char *end, const char *set); +char * net_FindCharInSet(const char *str, const char *end, const char *set); /** * returns pointer to first character of |str| NOT in the given set. if all @@ -157,13 +157,13 @@ NS_HIDDEN_(char *) net_FindCharInSet(const char *str, const char *end, const cha * included in |set|, then stops prematurely if a null byte is encountered, * and returns the address of the null byte. */ -NS_HIDDEN_(char *) net_FindCharNotInSet(const char *str, const char *end, const char *set); +char * net_FindCharNotInSet(const char *str, const char *end, const char *set); /** * returns pointer to last character of |str| NOT in the given set. if all * characters are in the given set, then |str - 1| is returned. */ -NS_HIDDEN_(char *) net_RFindCharNotInSet(const char *str, const char *end, const char *set); +char * net_RFindCharNotInSet(const char *str, const char *end, const char *set); /** * Parses a content-type header and returns the content type and @@ -173,7 +173,7 @@ NS_HIDDEN_(char *) net_RFindCharNotInSet(const char *str, const char *end, const * true. Note that aContentCharset can be empty even if aHadCharset * is true. */ -NS_HIDDEN_(void) net_ParseContentType(const nsACString &aHeaderStr, +void net_ParseContentType(const nsACString &aHeaderStr, nsACString &aContentType, nsACString &aContentCharset, bool* aHadCharset); @@ -186,7 +186,7 @@ NS_HIDDEN_(void) net_ParseContentType(const nsACString &aHeaderStr, * it's possible to have aContentCharset empty and *aHadCharset true when * *aCharsetStart is nonnegative; this corresponds to charset="". */ -NS_HIDDEN_(void) net_ParseContentType(const nsACString &aHeaderStr, +void net_ParseContentType(const nsACString &aHeaderStr, nsACString &aContentType, nsACString &aContentCharset, bool *aHadCharset, @@ -215,16 +215,16 @@ inline char *net_RFindCharNotInSet(const char *str, const char *set) * This function returns true if the given hostname does not include any * restricted characters. Otherwise, false is returned. */ -NS_HIDDEN_(bool) net_IsValidHostName(const nsCSubstring &host); +bool net_IsValidHostName(const nsCSubstring &host); /** * Checks whether the IPv4 address is valid according to RFC 3986 section 3.2.2. */ -NS_HIDDEN_(bool) net_IsValidIPv4Addr(const char *addr, int32_t addrLen); +bool net_IsValidIPv4Addr(const char *addr, int32_t addrLen); /** * Checks whether the IPv6 address is valid according to RFC 3986 section 3.2.2. */ -NS_HIDDEN_(bool) net_IsValidIPv6Addr(const char *addr, int32_t addrLen); +bool net_IsValidIPv6Addr(const char *addr, int32_t addrLen); #endif // !nsURLHelper_h__ diff --git a/netwerk/build/nsNetModule.cpp b/netwerk/build/nsNetModule.cpp index a1606c4d2b2..a97347beb37 100644 --- a/netwerk/build/nsNetModule.cpp +++ b/netwerk/build/nsNetModule.cpp @@ -49,8 +49,8 @@ #endif typedef nsCategoryCache ContentSnifferCache; -NS_HIDDEN_(ContentSnifferCache*) gNetSniffers = nullptr; -NS_HIDDEN_(ContentSnifferCache*) gDataSniffers = nullptr; +ContentSnifferCache* gNetSniffers = nullptr; +ContentSnifferCache* gDataSniffers = nullptr; /////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/protocol/data/nsDataHandler.h b/netwerk/protocol/data/nsDataHandler.h index 5a77f14b8cf..8eeca4fb929 100644 --- a/netwerk/protocol/data/nsDataHandler.h +++ b/netwerk/protocol/data/nsDataHandler.h @@ -27,7 +27,7 @@ public: // Parse a data: URI and return the individual parts // (the given spec will temporarily be modified but will be returned // to the original before returning) - static NS_HIDDEN_(nsresult) ParseURI(nsCString& spec, + static nsresult ParseURI(nsCString& spec, nsCString& contentType, nsCString& contentCharset, bool& isBase64, diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.h b/netwerk/protocol/viewsource/nsViewSourceChannel.h index 882edd9474d..8b86bf89ffe 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.h +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.h @@ -47,9 +47,9 @@ public: : mIsDocument(false) , mOpened(false) {} - NS_HIDDEN_(nsresult) Init(nsIURI* uri); + nsresult Init(nsIURI* uri); - NS_HIDDEN_(nsresult) InitSrcdoc(nsIURI* aURI, const nsAString &aSrcdoc, + nsresult InitSrcdoc(nsIURI* aURI, const nsAString &aSrcdoc, nsIURI* aBaseURI); protected: diff --git a/parser/htmlparser/public/nsScannerString.h b/parser/htmlparser/public/nsScannerString.h index 3de69f20817..466c8d696d7 100644 --- a/parser/htmlparser/public/nsScannerString.h +++ b/parser/htmlparser/public/nsScannerString.h @@ -291,7 +291,7 @@ class nsScannerSharedSubstring } // Acquire a copy-on-write reference to the given substring. - NS_HIDDEN_(void) Rebind(const nsScannerIterator& aStart, + void Rebind(const nsScannerIterator& aStart, const nsScannerIterator& aEnd); // Get a mutable reference to this string @@ -309,8 +309,8 @@ class nsScannerSharedSubstring private: typedef nsScannerBufferList::Buffer Buffer; - NS_HIDDEN_(void) ReleaseBuffer(); - NS_HIDDEN_(void) MakeMutable(); + void ReleaseBuffer(); + void MakeMutable(); nsDependentSubstring mString; Buffer *mBuffer; diff --git a/storage/src/FileSystemModule.h b/storage/src/FileSystemModule.h index 0055854cf0a..40c3a77dbff 100644 --- a/storage/src/FileSystemModule.h +++ b/storage/src/FileSystemModule.h @@ -14,7 +14,7 @@ struct sqlite3; namespace mozilla { namespace storage { -NS_HIDDEN_(int) RegisterFileSystemModule(sqlite3* aDB, const char* aName); +int RegisterFileSystemModule(sqlite3* aDB, const char* aName); } // namespace storage } // namespace mozilla diff --git a/storage/src/SQLCollations.h b/storage/src/SQLCollations.h index fb4ef7fbdee..d6d0d456276 100644 --- a/storage/src/SQLCollations.h +++ b/storage/src/SQLCollations.h @@ -26,7 +26,7 @@ namespace storage { * The Service that owns the nsICollation used by our collations. * @return the SQLite status code indicating success or failure. */ -NS_HIDDEN_(int) registerCollations(sqlite3 *aDB, Service *aService); +int registerCollations(sqlite3 *aDB, Service *aService); //////////////////////////////////////////////////////////////////////////////// //// Predefined Functions @@ -51,7 +51,7 @@ NS_HIDDEN_(int) registerCollations(sqlite3 *aDB, Service *aService); * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollation8(void *aService, +int localeCollation8(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -78,7 +78,7 @@ NS_HIDDEN_(int) localeCollation8(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationCaseSensitive8(void *aService, +int localeCollationCaseSensitive8(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -105,7 +105,7 @@ NS_HIDDEN_(int) localeCollationCaseSensitive8(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationAccentSensitive8(void *aService, +int localeCollationAccentSensitive8(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -131,7 +131,7 @@ NS_HIDDEN_(int) localeCollationAccentSensitive8(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationCaseAccentSensitive8(void *aService, +int localeCollationCaseAccentSensitive8(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -157,7 +157,7 @@ NS_HIDDEN_(int) localeCollationCaseAccentSensitive8(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollation16(void *aService, +int localeCollation16(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -184,7 +184,7 @@ NS_HIDDEN_(int) localeCollation16(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationCaseSensitive16(void *aService, +int localeCollationCaseSensitive16(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -211,7 +211,7 @@ NS_HIDDEN_(int) localeCollationCaseSensitive16(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationAccentSensitive16(void *aService, +int localeCollationAccentSensitive16(void *aService, int aLen1, const void *aStr1, int aLen2, @@ -237,7 +237,7 @@ NS_HIDDEN_(int) localeCollationAccentSensitive16(void *aService, * If aStr1 > aStr2, returns a positive number. If aStr1 == aStr2, * returns 0. */ -NS_HIDDEN_(int) localeCollationCaseAccentSensitive16(void *aService, +int localeCollationCaseAccentSensitive16(void *aService, int aLen1, const void *aStr1, int aLen2, diff --git a/storage/src/mozStorageSQLFunctions.h b/storage/src/mozStorageSQLFunctions.h index f35eb1e69c9..556a4a7c1b8 100644 --- a/storage/src/mozStorageSQLFunctions.h +++ b/storage/src/mozStorageSQLFunctions.h @@ -20,7 +20,7 @@ namespace storage { * The database we'll be registering the functions with. * @return the SQLite status code indicating success or failure. */ -NS_HIDDEN_(int) registerFunctions(sqlite3 *aDB); +int registerFunctions(sqlite3 *aDB); //////////////////////////////////////////////////////////////////////////////// //// Predefined Functions @@ -36,7 +36,7 @@ NS_HIDDEN_(int) registerFunctions(sqlite3 *aDB); * @param aArgv * An array of the arguments the functions is being called with. */ -NS_HIDDEN_(void) caseFunction(sqlite3_context *aCtx, +void caseFunction(sqlite3_context *aCtx, int aArgc, sqlite3_value **aArgv); @@ -51,7 +51,7 @@ NS_HIDDEN_(void) caseFunction(sqlite3_context *aCtx, * @param aArgv * An array of the arguments the functions is being called with. */ -NS_HIDDEN_(void) likeFunction(sqlite3_context *aCtx, +void likeFunction(sqlite3_context *aCtx, int aArgc, sqlite3_value **aArgv); @@ -66,7 +66,7 @@ NS_HIDDEN_(void) likeFunction(sqlite3_context *aCtx, * @param aArgv * An array of the arguments the functions is being called with. */ -NS_HIDDEN_(void) levenshteinDistanceFunction(sqlite3_context *aCtx, +void levenshteinDistanceFunction(sqlite3_context *aCtx, int aArgc, sqlite3_value **aArgv); diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.h b/toolkit/components/typeaheadfind/nsTypeAheadFind.h index 5b0c08ef89c..e2c58e11eae 100644 --- a/toolkit/components/typeaheadfind/nsTypeAheadFind.h +++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.h @@ -68,7 +68,7 @@ protected: // Get the pres shell from mPresShell and return it only if it is still // attached to the DOM window. - NS_HIDDEN_(already_AddRefed) GetPresShell(); + already_AddRefed GetPresShell(); void ReleaseStrongMemberVariables(); diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp index d4007f500f7..73271db59da 100644 --- a/toolkit/profile/nsToolkitProfileService.cpp +++ b/toolkit/profile/nsToolkitProfileService.cpp @@ -122,7 +122,7 @@ private: gService = nullptr; } - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); nsresult CreateTimesInternal(nsIFile *profileDir); diff --git a/toolkit/system/gnome/nsGConfService.h b/toolkit/system/gnome/nsGConfService.h index 8345c515353..8a77a6fca99 100644 --- a/toolkit/system/gnome/nsGConfService.h +++ b/toolkit/system/gnome/nsGConfService.h @@ -20,7 +20,7 @@ public: NS_DECL_NSIGCONFSERVICE nsGConfService() : mClient(nullptr) {} - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); private: ~nsGConfService() NS_HIDDEN; diff --git a/toolkit/system/gnome/nsGSettingsService.h b/toolkit/system/gnome/nsGSettingsService.h index b3429bb1af2..bae127cd492 100644 --- a/toolkit/system/gnome/nsGSettingsService.h +++ b/toolkit/system/gnome/nsGSettingsService.h @@ -17,7 +17,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIGSETTINGSSERVICE - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); private: ~nsGSettingsService(); diff --git a/toolkit/system/gnome/nsGnomeVFSService.h b/toolkit/system/gnome/nsGnomeVFSService.h index d8dbcab86ee..575e10ec34b 100644 --- a/toolkit/system/gnome/nsGnomeVFSService.h +++ b/toolkit/system/gnome/nsGnomeVFSService.h @@ -18,7 +18,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIGNOMEVFSSERVICE - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); }; #endif diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h index 3763ab678d1..4ee1a11e9f1 100644 --- a/toolkit/xre/nsAppRunner.h +++ b/toolkit/xre/nsAppRunner.h @@ -65,10 +65,10 @@ extern bool gLogConsoleErrors; */ nsresult NS_CreateNativeAppSupport(nsINativeAppSupport* *aResult); -NS_HIDDEN_(nsresult) +nsresult NS_NewToolkitProfileService(nsIToolkitProfileService* *aResult); -NS_HIDDEN_(nsresult) +nsresult NS_NewToolkitProfileFactory(nsIFactory* *aResult); /** @@ -88,11 +88,11 @@ NS_NewToolkitProfileFactory(nsIFactory* *aResult); * @return NS_ERROR_FILE_ACCESS_DENIED to indicate that the profile * directory cannot be unlocked. */ -NS_HIDDEN_(nsresult) +nsresult NS_LockProfilePath(nsIFile* aPath, nsIFile* aTempPath, nsIProfileUnlocker* *aUnlocker, nsIProfileLock* *aResult); -NS_HIDDEN_(void) +void WriteConsoleLog(); #ifdef XP_WIN diff --git a/toolkit/xre/nsUpdateDriver.h b/toolkit/xre/nsUpdateDriver.h index 1fc0cd3614c..dad2c8821cc 100644 --- a/toolkit/xre/nsUpdateDriver.h +++ b/toolkit/xre/nsUpdateDriver.h @@ -48,7 +48,7 @@ class nsIFile; * * This function does not modify appDir. */ -NS_HIDDEN_(nsresult) ProcessUpdates(nsIFile *greDir, nsIFile *appDir, +nsresult ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir, int argc, char **argv, const char *appVersion, diff --git a/uriloader/base/nsURILoader.h b/uriloader/base/nsURILoader.h index 6c8bae6e5f8..e20135923cc 100644 --- a/uriloader/base/nsURILoader.h +++ b/uriloader/base/nsURILoader.h @@ -38,7 +38,7 @@ protected: * Equivalent to nsIURILoader::openChannel, but allows specifying whether the * channel is opened already. */ - NS_HIDDEN_(nsresult) OpenChannel(nsIChannel* channel, + nsresult OpenChannel(nsIChannel* channel, uint32_t aFlags, nsIInterfaceRequestor* aWindowContext, bool aChannelOpen, diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.h b/uriloader/exthandler/android/nsMIMEInfoAndroid.h index df480498530..33339603131 100644 --- a/uriloader/exthandler/android/nsMIMEInfoAndroid.h +++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.h @@ -31,8 +31,8 @@ public: nsMIMEInfoAndroid(const nsACString& aMIMEType); protected: - virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI); + virtual nsresult LaunchDefaultWithFile(nsIFile* aFile); + virtual nsresult LoadUriInternal(nsIURI *aURI); nsCOMPtr mHandlerApps; nsCString mType; nsTArray mExtensions; diff --git a/uriloader/exthandler/android/nsOSHelperAppService.h b/uriloader/exthandler/android/nsOSHelperAppService.h index bcb11dfb417..2e1afbaae4f 100644 --- a/uriloader/exthandler/android/nsOSHelperAppService.h +++ b/uriloader/exthandler/android/nsOSHelperAppService.h @@ -20,7 +20,7 @@ public: const nsACString& aFileExt, bool* aFound); - virtual NS_HIDDEN_(nsresult) + virtual nsresult OSProtocolHandlerExists(const char* aScheme, bool* aExists); diff --git a/uriloader/exthandler/gonk/nsOSHelperAppService.cpp b/uriloader/exthandler/gonk/nsOSHelperAppService.cpp index 58503d870e9..4188251ac27 100644 --- a/uriloader/exthandler/gonk/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/gonk/nsOSHelperAppService.cpp @@ -22,7 +22,7 @@ public: nsGonkMIMEInfo(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) { } protected: - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI) { + virtual nsresult LoadUriInternal(nsIURI *aURI) { return NS_ERROR_NOT_IMPLEMENTED; } }; diff --git a/uriloader/exthandler/gonk/nsOSHelperAppService.h b/uriloader/exthandler/gonk/nsOSHelperAppService.h index f0965248670..9d39876ec9d 100644 --- a/uriloader/exthandler/gonk/nsOSHelperAppService.h +++ b/uriloader/exthandler/gonk/nsOSHelperAppService.h @@ -31,7 +31,7 @@ public: const nsACString& aFileExt, bool* aFound); - virtual NS_HIDDEN_(nsresult) + virtual nsresult OSProtocolHandlerExists(const char* aScheme, bool* aExists); }; diff --git a/uriloader/exthandler/mac/nsMIMEInfoMac.h b/uriloader/exthandler/mac/nsMIMEInfoMac.h index 8a18aeeb513..884e32b596f 100644 --- a/uriloader/exthandler/mac/nsMIMEInfoMac.h +++ b/uriloader/exthandler/mac/nsMIMEInfoMac.h @@ -16,14 +16,14 @@ class nsMIMEInfoMac : public nsMIMEInfoImpl { NS_IMETHOD LaunchWithFile(nsIFile* aFile); protected: - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI); + virtual nsresult LoadUriInternal(nsIURI *aURI); #ifdef DEBUG - virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile) { + virtual nsresult LaunchDefaultWithFile(nsIFile* aFile) { NS_NOTREACHED("do not call this method, use LaunchWithFile"); return NS_ERROR_UNEXPECTED; } #endif - static NS_HIDDEN_(nsresult) OpenApplicationWithURI(nsIFile *aApplication, + static nsresult OpenApplicationWithURI(nsIFile *aApplication, const nsCString& aURI); NS_IMETHOD GetDefaultDescription(nsAString& aDefaultDescription); diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index f227587fb5c..72523d31daf 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -71,7 +71,7 @@ public: * Initializes internal state. Will be called automatically when * this service is first instantiated. */ - NS_HIDDEN_(nsresult) Init(); + nsresult Init(); /** * Given a mimetype and an extension, looks up a mime info from the OS. @@ -109,7 +109,7 @@ public: virtual nsresult GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile); - virtual NS_HIDDEN_(nsresult) OSProtocolHandlerExists(const char *aScheme, + virtual nsresult OSProtocolHandlerExists(const char *aScheme, bool *aExists) = 0; protected: @@ -121,7 +121,7 @@ protected: * @param aContentType The type to search for. * @param aMIMEInfo [inout] The mime info, if found */ - NS_HIDDEN_(nsresult) FillMIMEInfoForMimeTypeFromExtras( + nsresult FillMIMEInfoForMimeTypeFromExtras( const nsACString& aContentType, nsIMIMEInfo * aMIMEInfo); /** * Searches the "extra" array of MIMEInfo objects for an object @@ -131,7 +131,7 @@ protected: * * @see FillMIMEInfoForMimeTypeFromExtras */ - NS_HIDDEN_(nsresult) FillMIMEInfoForExtensionFromExtras( + nsresult FillMIMEInfoForExtensionFromExtras( const nsACString& aExtension, nsIMIMEInfo * aMIMEInfo); /** @@ -140,7 +140,7 @@ protected: * @param aMIMEType [out] The found MIME type. * @return true if the extension was found, false otherwise. */ - NS_HIDDEN_(bool) GetTypeFromExtras(const nsACString& aExtension, + bool GetTypeFromExtras(const nsACString& aExtension, nsACString& aMIMEType); #ifdef PR_LOGGING diff --git a/uriloader/exthandler/nsLocalHandlerApp.h b/uriloader/exthandler/nsLocalHandlerApp.h index ee26268e7fc..391d474539d 100644 --- a/uriloader/exthandler/nsLocalHandlerApp.h +++ b/uriloader/exthandler/nsLocalHandlerApp.h @@ -42,7 +42,7 @@ protected: * @param aApp The application to launch (may not be null) * @param aArg The argument to pass on the command line */ - NS_HIDDEN_(nsresult) LaunchWithIProcess(const nsCString &aArg); + nsresult LaunchWithIProcess(const nsCString &aArg); }; // any platforms that need a platform-specific class instead of just diff --git a/uriloader/exthandler/nsMIMEInfoImpl.h b/uriloader/exthandler/nsMIMEInfoImpl.h index af4c1fca9cd..0608f13ec45 100644 --- a/uriloader/exthandler/nsMIMEInfoImpl.h +++ b/uriloader/exthandler/nsMIMEInfoImpl.h @@ -99,14 +99,14 @@ class nsMIMEInfoBase : public nsIMIMEInfo { * * @param aFile The file that should be opened */ - virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile) = 0; + virtual nsresult LaunchDefaultWithFile(nsIFile* aFile) = 0; /** * Loads the URI with the OS default app. * * @param aURI The URI to pass off to the OS. */ - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI) = 0; + virtual nsresult LoadUriInternal(nsIURI *aURI) = 0; static already_AddRefed InitProcess(nsIFile* aApp, nsresult* aResult); @@ -120,9 +120,9 @@ class nsMIMEInfoBase : public nsIMIMEInfo { * @param aApp The application to launch (may not be null) * @param aArg The argument to pass on the command line */ - static NS_HIDDEN_(nsresult) LaunchWithIProcess(nsIFile* aApp, + static nsresult LaunchWithIProcess(nsIFile* aApp, const nsCString &aArg); - static NS_HIDDEN_(nsresult) LaunchWithIProcess(nsIFile* aApp, + static nsresult LaunchWithIProcess(nsIFile* aApp, const nsString &aArg); /** @@ -131,7 +131,7 @@ class nsMIMEInfoBase : public nsIMIMEInfo { * @param aURI the file: URI in question * @param aFile the associated nsIFile (out param) */ - static NS_HIDDEN_(nsresult) GetLocalFileFromURI(nsIURI *aURI, + static nsresult GetLocalFileFromURI(nsIURI *aURI, nsIFile **aFile); // member variables @@ -181,13 +181,13 @@ class nsMIMEInfoImpl : public nsMIMEInfoBase { * The base class implementation is to use LaunchWithIProcess in combination * with mDefaultApplication. Subclasses can override that behaviour. */ - virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); + virtual nsresult LaunchDefaultWithFile(nsIFile* aFile); /** * Loads the URI with the OS default app. This should be overridden by each * OS's implementation. */ - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI) = 0; + virtual nsresult LoadUriInternal(nsIURI *aURI) = 0; nsCOMPtr mDefaultApplication; ///< default application associated with this type. }; diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.h b/uriloader/exthandler/unix/nsMIMEInfoUnix.h index b3261f0ba67..9023c09e539 100644 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.h +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.h @@ -21,9 +21,9 @@ public: protected: NS_IMETHOD GetHasDefaultHandler(bool *_retval); - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI); + virtual nsresult LoadUriInternal(nsIURI *aURI); - virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile *aFile); + virtual nsresult LaunchDefaultWithFile(nsIFile *aFile); #if defined(MOZ_ENABLE_CONTENTACTION) NS_IMETHOD GetPossibleApplicationHandlers(nsIMutableArray * *aPossibleAppHandlers); #endif diff --git a/uriloader/exthandler/win/nsMIMEInfoWin.h b/uriloader/exthandler/win/nsMIMEInfoWin.h index 525e06d5b55..3b8aea67722 100644 --- a/uriloader/exthandler/win/nsMIMEInfoWin.h +++ b/uriloader/exthandler/win/nsMIMEInfoWin.h @@ -31,7 +31,7 @@ class nsMIMEInfoWin : public nsMIMEInfoBase, public nsIPropertyBag { } protected: - virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI); + virtual nsresult LoadUriInternal(nsIURI *aURI); virtual nsresult LaunchDefaultWithFile(nsIFile* aFile); private: diff --git a/widget/gtk/nsNativeThemeGTK.h b/widget/gtk/nsNativeThemeGTK.h index ddfc9d28e43..8ca5a67eaf3 100644 --- a/widget/gtk/nsNativeThemeGTK.h +++ b/widget/gtk/nsNativeThemeGTK.h @@ -29,12 +29,12 @@ public: NS_IMETHOD GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, nsIntMargin* aResult); - virtual NS_HIDDEN_(bool) GetWidgetPadding(nsDeviceContext* aContext, + virtual bool GetWidgetPadding(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, nsIntMargin* aResult); - virtual NS_HIDDEN_(bool) GetWidgetOverflow(nsDeviceContext* aContext, + virtual bool GetWidgetOverflow(nsDeviceContext* aContext, nsIFrame* aFrame, uint8_t aWidgetType, nsRect* aOverflowRect); diff --git a/xpcom/base/nsMemoryImpl.h b/xpcom/base/nsMemoryImpl.h index f350d873989..f3826729335 100644 --- a/xpcom/base/nsMemoryImpl.h +++ b/xpcom/base/nsMemoryImpl.h @@ -35,8 +35,8 @@ public: static nsresult Create(nsISupports* aOuter, const nsIID& aIID, void** aResult); - NS_HIDDEN_(nsresult) FlushMemory(const char16_t* aReason, bool aImmediate); - NS_HIDDEN_(nsresult) RunFlushers(const char16_t* aReason); + nsresult FlushMemory(const char16_t* aReason, bool aImmediate); + nsresult RunFlushers(const char16_t* aReason); protected: struct FlushEvent : public nsIRunnable diff --git a/xpcom/ds/TimeStamp.h b/xpcom/ds/TimeStamp.h index 1d1348f16c3..8821b55849c 100644 --- a/xpcom/ds/TimeStamp.h +++ b/xpcom/ds/TimeStamp.h @@ -343,8 +343,8 @@ public: // two TimeStamps, or scaling TimeStamps, is nonsense and must never // be allowed. - static NS_HIDDEN_(nsresult) Startup(); - static NS_HIDDEN_(void) Shutdown(); + static nsresult Startup(); + static void Shutdown(); private: friend struct IPC::ParamTraits; diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h index fdb93006701..558bdae3215 100644 --- a/xpcom/ds/nsMathUtils.h +++ b/xpcom/ds/nsMathUtils.h @@ -19,15 +19,15 @@ /* * round */ -inline NS_HIDDEN_(double) NS_round(double x) +inline double NS_round(double x) { return x >= 0.0 ? floor(x + 0.5) : ceil(x - 0.5); } -inline NS_HIDDEN_(float) NS_roundf(float x) +inline float NS_roundf(float x) { return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f); } -inline NS_HIDDEN_(int32_t) NS_lround(double x) +inline int32_t NS_lround(double x) { return x >= 0.0 ? int32_t(x + 0.5) : int32_t(x - 0.5); } @@ -36,7 +36,7 @@ inline NS_HIDDEN_(int32_t) NS_lround(double x) /* negative numbers. */ #if defined(XP_WIN32) && defined(_M_IX86) && !defined(__GNUC__) -inline NS_HIDDEN_(int32_t) NS_lroundup30(float x) +inline int32_t NS_lroundup30(float x) { /* Code derived from Laurent de Soras' paper at */ /* http://ldesoras.free.fr/doc/articles/rounding_en.pdf */ @@ -68,7 +68,7 @@ inline NS_HIDDEN_(int32_t) NS_lroundup30(float x) } #endif /* XP_WIN32 && _M_IX86 && !__GNUC__ */ -inline NS_HIDDEN_(int32_t) NS_lroundf(float x) +inline int32_t NS_lroundf(float x) { return x >= 0.0f ? int32_t(x + 0.5f) : int32_t(x - 0.5f); } @@ -78,7 +78,7 @@ inline NS_HIDDEN_(int32_t) NS_lroundf(float x) * turns up with none of the possibilities below it would be okay to fall * back to sqrt(x*x + y*y). */ -inline NS_HIDDEN_(double) NS_hypot(double x, double y) +inline double NS_hypot(double x, double y) { #ifdef __GNUC__ return __builtin_hypot(x, y); @@ -93,7 +93,7 @@ inline NS_HIDDEN_(double) NS_hypot(double x, double y) * Check whether a floating point number is finite (not +/-infinity and not a * NaN value). */ -inline NS_HIDDEN_(bool) NS_finite(double d) +inline bool NS_finite(double d) { #ifdef WIN32 // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. @@ -113,7 +113,7 @@ inline NS_HIDDEN_(bool) NS_finite(double d) * The main difference is that the result of this method will have the sign of * y while the result of fmod(x, y) will have the sign of x. */ -inline NS_HIDDEN_(double) NS_floorModulo(double x, double y) +inline double NS_floorModulo(double x, double y) { return (x - y * floor(x / y)); } diff --git a/xpcom/threads/TimerThread.h b/xpcom/threads/TimerThread.h index 343783c7f0b..e9526d747c3 100644 --- a/xpcom/threads/TimerThread.h +++ b/xpcom/threads/TimerThread.h @@ -33,14 +33,14 @@ public: typedef mozilla::TimeDuration TimeDuration; TimerThread(); - NS_HIDDEN_(nsresult) InitLocks(); + nsresult InitLocks(); NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_NSIRUNNABLE NS_DECL_NSIOBSERVER - NS_HIDDEN_(nsresult) Init(); - NS_HIDDEN_(nsresult) Shutdown(); + nsresult Init(); + nsresult Shutdown(); nsresult AddTimer(nsTimerImpl* aTimer); nsresult TimerDelayChanged(nsTimerImpl* aTimer); diff --git a/xpcom/threads/nsTimerImpl.h b/xpcom/threads/nsTimerImpl.h index e33b8ee1265..4644f964316 100644 --- a/xpcom/threads/nsTimerImpl.h +++ b/xpcom/threads/nsTimerImpl.h @@ -52,8 +52,8 @@ public: nsTimerImpl(); - static NS_HIDDEN_(nsresult) Startup(); - static NS_HIDDEN_(void) Shutdown(); + static nsresult Startup(); + static void Shutdown(); friend class TimerThread; friend struct TimerAdditionComparator; diff --git a/xpfe/appshell/src/nsXULWindow.h b/xpfe/appshell/src/nsXULWindow.h index 3fc09dec556..9bfbbe6d208 100644 --- a/xpfe/appshell/src/nsXULWindow.h +++ b/xpfe/appshell/src/nsXULWindow.h @@ -101,10 +101,10 @@ protected: mozilla::dom::Element* GetWindowDOMElement() const; // See nsIDocShellTreeOwner for docs on next two methods - NS_HIDDEN_(nsresult) ContentShellAdded(nsIDocShellTreeItem* aContentShell, + nsresult ContentShellAdded(nsIDocShellTreeItem* aContentShell, bool aPrimary, bool aTargetable, const nsAString& aID); - NS_HIDDEN_(nsresult) ContentShellRemoved(nsIDocShellTreeItem* aContentShell); + nsresult ContentShellRemoved(nsIDocShellTreeItem* aContentShell); NS_IMETHOD SizeShellTo(nsIDocShellTreeItem* aShellItem, int32_t aCX, int32_t aCY); NS_IMETHOD ExitModalLoop(nsresult aStatus);