Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1118548 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/xul; r=baku

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 19:54:05 -05:00
parent 49d8a4b2ed
commit 80b0de2eb3
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/xul/nsXULElement.cpp
View File

@ -138,7 +138,7 @@ public:
{
}
NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle)
NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle) MOZ_OVERRIDE
{
nsXULElement* element = static_cast<nsXULElement*>(mElement.get());
NS_ADDREF(*aStyle = element->Style());

20
dom/xul/templates/nsXULContentBuilder.cpp
View File

@ -72,14 +72,14 @@ class nsXULContentBuilder : public nsXULTemplateBuilder
{
public:
// nsIXULTemplateBuilder interface
NS_IMETHOD CreateContents(nsIContent* aElement, bool aForceCreation);
NS_IMETHOD CreateContents(nsIContent* aElement, bool aForceCreation) MOZ_OVERRIDE;
NS_IMETHOD HasGeneratedContent(nsIRDFResource* aResource,
nsIAtom* aTag,
bool* aGenerated);
bool* aGenerated) MOZ_OVERRIDE;
NS_IMETHOD GetResultForContent(nsIDOMElement* aContent,
nsIXULTemplateResult** aResult);
nsIXULTemplateResult** aResult) MOZ_OVERRIDE;
// nsIMutationObserver interface
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
@ -91,12 +91,12 @@ protected:
nsXULContentBuilder();
void Traverse(nsCycleCollectionTraversalCallback &cb) const
void Traverse(nsCycleCollectionTraversalCallback& aCb) const MOZ_OVERRIDE
{
mSortState.Traverse(cb);
mSortState.Traverse(aCb);
}
virtual void Uninit(bool aIsFinal);
virtual void Uninit(bool aIsFinal) MOZ_OVERRIDE;
// Implementation methods
nsresult
@ -269,7 +269,7 @@ protected:
bool aNotify);
virtual nsresult
RebuildAll();
RebuildAll() MOZ_OVERRIDE;
// GetInsertionLocations, ReplaceMatch and SynchronizeResult are inherited
// from nsXULTemplateBuilder
@ -281,7 +281,7 @@ protected:
*/
virtual bool
GetInsertionLocations(nsIXULTemplateResult* aOldResult,
nsCOMArray<nsIContent>** aLocations);
nsCOMArray<nsIContent>** aLocations) MOZ_OVERRIDE;
/**
* Remove the content associated with aOldResult which no longer matches,
@ -291,7 +291,7 @@ protected:
ReplaceMatch(nsIXULTemplateResult* aOldResult,
nsTemplateMatch* aNewMatch,
nsTemplateRule* aNewMatchRule,
void *aContext);
void *aContext) MOZ_OVERRIDE;
/**
* Synchronize a result bindings with the generated content for that
@ -299,7 +299,7 @@ protected:
* ResultBindingChanged method.
*/
virtual nsresult
SynchronizeResult(nsIXULTemplateResult* aResult);
SynchronizeResult(nsIXULTemplateResult* aResult) MOZ_OVERRIDE;
/**
* Compare a result to a content node. If the generated content for the

14
dom/xul/templates/nsXULTreeBuilder.cpp
View File

@ -55,7 +55,7 @@ public:
// nsITreeView
NS_DECL_NSITREEVIEW
// nsINativeTreeView: Untrusted code can use us
NS_IMETHOD EnsureNative() { return NS_OK; }
NS_IMETHOD EnsureNative() MOZ_OVERRIDE { return NS_OK; }
// nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
@ -72,7 +72,7 @@ protected:
/**
* Uninitialize the template builder
*/
virtual void Uninit(bool aIsFinal);
virtual void Uninit(bool aIsFinal) MOZ_OVERRIDE;
/**
* Get sort variables from the active <treecol>
@ -81,7 +81,7 @@ protected:
EnsureSortVariables();
virtual nsresult
RebuildAll();
RebuildAll() MOZ_OVERRIDE;
/**
* Given a row, use the row's match to figure out the appropriate
@ -169,7 +169,7 @@ protected:
NS_IMETHOD
HasGeneratedContent(nsIRDFResource* aResource,
nsIAtom* aTag,
bool* aGenerated);
bool* aGenerated) MOZ_OVERRIDE;
// GetInsertionLocations, ReplaceMatch and SynchronizeResult are inherited
// from nsXULTemplateBuilder
@ -180,7 +180,7 @@ protected:
*/
bool
GetInsertionLocations(nsIXULTemplateResult* aResult,
nsCOMArray<nsIContent>** aLocations);
nsCOMArray<nsIContent>** aLocations) MOZ_OVERRIDE;
/**
* Implement result replacement
@ -189,13 +189,13 @@ protected:
ReplaceMatch(nsIXULTemplateResult* aOldResult,
nsTemplateMatch* aNewMatch,
nsTemplateRule* aNewMatchRule,
void *aContext);
void* aContext) MOZ_OVERRIDE;
/**
* Implement match synchronization
*/
virtual nsresult
SynchronizeResult(nsIXULTemplateResult* aResult);
SynchronizeResult(nsIXULTemplateResult* aResult) MOZ_OVERRIDE;
/**
* The tree's box object, used to communicate with the front-end.