From ebaa5caa18ac7864fd5e4f05e0fcb57d921c47f6 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 6 Jan 2015 19:54:15 -0500 Subject: [PATCH] Bug 1118550 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/xml; r=baku --- dom/xml/CDATASection.h | 2 +- dom/xml/ProcessingInstruction.h | 2 +- dom/xml/nsXMLFragmentContentSink.cpp | 60 ++++++++++++++-------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dom/xml/CDATASection.h b/dom/xml/CDATASection.h index d63b5f78eb40..79f06576d797 100644 --- a/dom/xml/CDATASection.h +++ b/dom/xml/CDATASection.h @@ -57,7 +57,7 @@ public: // Empty interface // nsINode - virtual bool IsNodeOfType(uint32_t aFlags) const; + virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const MOZ_OVERRIDE; diff --git a/dom/xml/ProcessingInstruction.h b/dom/xml/ProcessingInstruction.h index 6448bd46b08e..23b623a603fd 100644 --- a/dom/xml/ProcessingInstruction.h +++ b/dom/xml/ProcessingInstruction.h @@ -35,7 +35,7 @@ public: NS_DECL_NSIDOMPROCESSINGINSTRUCTION // nsINode - virtual bool IsNodeOfType(uint32_t aFlags) const; + virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE; virtual nsGenericDOMDataNode* CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const MOZ_OVERRIDE; diff --git a/dom/xml/nsXMLFragmentContentSink.cpp b/dom/xml/nsXMLFragmentContentSink.cpp index 84d331d739c5..d7c09704a5d3 100644 --- a/dom/xml/nsXMLFragmentContentSink.cpp +++ b/dom/xml/nsXMLFragmentContentSink.cpp @@ -45,51 +45,51 @@ public: nsXMLContentSink) // nsIExpatSink - NS_IMETHOD HandleDoctypeDecl(const nsAString & aSubset, - const nsAString & aName, - const nsAString & aSystemId, - const nsAString & aPublicId, - nsISupports* aCatalogData); - NS_IMETHOD HandleProcessingInstruction(const char16_t *aTarget, - const char16_t *aData); - NS_IMETHOD HandleXMLDeclaration(const char16_t *aVersion, - const char16_t *aEncoding, - int32_t aStandalone); - NS_IMETHOD ReportError(const char16_t* aErrorText, + NS_IMETHOD HandleDoctypeDecl(const nsAString& aSubset, + const nsAString& aName, + const nsAString& aSystemId, + const nsAString& aPublicId, + nsISupports* aCatalogData) MOZ_OVERRIDE; + NS_IMETHOD HandleProcessingInstruction(const char16_t* aTarget, + const char16_t* aData) MOZ_OVERRIDE; + NS_IMETHOD HandleXMLDeclaration(const char16_t* aVersion, + const char16_t* aEncoding, + int32_t aStandalone) MOZ_OVERRIDE; + NS_IMETHOD ReportError(const char16_t* aErrorText, const char16_t* aSourceText, - nsIScriptError *aError, - bool *_retval); + nsIScriptError* aError, + bool* aRetval) MOZ_OVERRIDE; // nsIContentSink - NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode); - NS_IMETHOD DidBuildModel(bool aTerminated); - NS_IMETHOD SetDocumentCharset(nsACString& aCharset); - virtual nsISupports *GetTarget(); + NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode) MOZ_OVERRIDE; + NS_IMETHOD DidBuildModel(bool aTerminated) MOZ_OVERRIDE; + NS_IMETHOD SetDocumentCharset(nsACString& aCharset) MOZ_OVERRIDE; + virtual nsISupports* GetTarget() MOZ_OVERRIDE; NS_IMETHOD DidProcessATokenImpl(); // nsIXMLContentSink // nsIFragmentContentSink - NS_IMETHOD FinishFragmentParsing(nsIDOMDocumentFragment** aFragment); - NS_IMETHOD SetTargetDocument(nsIDocument* aDocument); - NS_IMETHOD WillBuildContent(); - NS_IMETHOD DidBuildContent(); - NS_IMETHOD IgnoreFirstContainer(); - NS_IMETHOD SetPreventScriptExecution(bool aPreventScriptExecution); + NS_IMETHOD FinishFragmentParsing(nsIDOMDocumentFragment** aFragment) MOZ_OVERRIDE; + NS_IMETHOD SetTargetDocument(nsIDocument* aDocument) MOZ_OVERRIDE; + NS_IMETHOD WillBuildContent() MOZ_OVERRIDE; + NS_IMETHOD DidBuildContent() MOZ_OVERRIDE; + NS_IMETHOD IgnoreFirstContainer() MOZ_OVERRIDE; + NS_IMETHOD SetPreventScriptExecution(bool aPreventScriptExecution) MOZ_OVERRIDE; protected: virtual ~nsXMLFragmentContentSink(); - virtual bool SetDocElement(int32_t aNameSpaceID, - nsIAtom *aTagName, - nsIContent *aContent); + virtual bool SetDocElement(int32_t aNameSpaceID, + nsIAtom* aTagName, + nsIContent* aContent) MOZ_OVERRIDE; virtual nsresult CreateElement(const char16_t** aAtts, uint32_t aAttsCount, mozilla::dom::NodeInfo* aNodeInfo, uint32_t aLineNumber, nsIContent** aResult, bool* aAppendContent, - mozilla::dom::FromParser aFromParser); - virtual nsresult CloseElement(nsIContent* aContent); + mozilla::dom::FromParser aFromParser) MOZ_OVERRIDE; + virtual nsresult CloseElement(nsIContent* aContent) MOZ_OVERRIDE; - virtual void MaybeStartLayout(bool aIgnorePendingSheets); + virtual void MaybeStartLayout(bool aIgnorePendingSheets) MOZ_OVERRIDE; // nsContentSink overrides virtual nsresult ProcessStyleLink(nsIContent* aElement, @@ -97,7 +97,7 @@ protected: bool aAlternate, const nsSubstring& aTitle, const nsSubstring& aType, - const nsSubstring& aMedia); + const nsSubstring& aMedia) MOZ_OVERRIDE; nsresult LoadXSLStyleSheet(nsIURI* aUrl); void StartLayout();