Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1118426 - Mark virtual overridden functions as MOZ_OVERRIDE in layout/style; r=dbaron

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 15:15:07 -05:00
parent 7e5c201140
commit 8a04f8a90c
12 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/style/CounterStyleManager.h
View File

@ -131,7 +131,7 @@ public:
uint8_t GetSystem() const { return mSystem; }
const nsTArray<nsString>& GetSymbols() const { return mSymbols; }
NS_INLINE_DECL_REFCOUNTING(AnonymousCounterStyle)
NS_INLINE_DECL_REFCOUNTING(AnonymousCounterStyle, MOZ_OVERRIDE)
private:
~AnonymousCounterStyle() {}

4
layout/style/FontFace.cpp
View File

@ -80,7 +80,7 @@ public:
void SetSource(const ArrayBuffer& aArrayBuffer);
void SetSource(const ArrayBufferView& aArrayBufferView);
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
void TakeBuffer(uint8_t*& aBuffer, uint32_t& aLength);
nsRefPtr<FontFace> mFontFace;
@ -156,7 +156,7 @@ public:
: mFontFace(aFontFace)
, mStatus(aStatus) {}
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
protected:
virtual ~FontFaceStatusSetter() {}

2
layout/style/FontFaceSet.h
View File

@ -165,7 +165,7 @@ public:
// nsICSSLoaderObserver
NS_IMETHOD StyleSheetLoaded(mozilla::CSSStyleSheet* aSheet,
bool aWasAlternate,
nsresult aStatus);
nsresult aStatus) MOZ_OVERRIDE;
// -- Web IDL --------------------------------------------------------------

4
layout/style/GroupRule.h
View File

@ -44,7 +44,7 @@ public:
// implement part of nsIStyleRule and Rule
DECL_STYLE_RULE_INHERIT_NO_DOMRULE
virtual void SetStyleSheet(CSSStyleSheet* aSheet);
virtual void SetStyleSheet(CSSStyleSheet* aSheet) MOZ_OVERRIDE;
// to help implement nsIStyleRule
#ifdef DEBUG
@ -74,7 +74,7 @@ public:
// non-virtual -- it is only called by subclasses
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const = 0;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE = 0;
static bool
CloneRuleInto(Rule* aRule, void* aArray)

6
layout/style/ImportRule.h
View File

@ -49,12 +49,12 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<Rule> Clone() const;
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
void SetSheet(CSSStyleSheet*);
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE

6
layout/style/NameSpaceRule.h
View File

@ -47,15 +47,15 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<Rule> Clone() const;
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
nsIAtom* GetPrefix() const { return mPrefix; }
void GetURLSpec(nsString& aURLSpec) const { aURLSpec = mURLSpec; }
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
MOZ_MUST_OVERRIDE;
MOZ_OVERRIDE MOZ_MUST_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE

10
layout/style/Rule.h
View File

@ -24,12 +24,12 @@ namespace css {
class GroupRule;
#define DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
#define DECL_STYLE_RULE_INHERIT \
DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
virtual nsIDOMCSSRule* GetDOMRule(); \
virtual nsIDOMCSSRule* GetExistingDOMRule();
#define DECL_STYLE_RULE_INHERIT \
DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE; \
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE;
class Rule : public nsIStyleRule {
protected:

2
layout/style/StyleRule.cpp
View File

@ -1054,7 +1054,7 @@ public:
NS_DECL_NSIDOMCSSSTYLERULE
// nsICSSStyleRuleDOMWrapper
NS_IMETHOD GetCSSStyleRule(StyleRule **aResult);
NS_IMETHOD GetCSSStyleRule(StyleRule **aResult) MOZ_OVERRIDE;
DOMCSSDeclarationImpl* DOMDeclaration() { return &mDOMDeclaration; }

10
layout/style/StyleRule.h
View File

@ -353,13 +353,13 @@ public:
void GetSelectorText(nsAString& aSelectorText);
void SetSelectorText(const nsAString& aSelectorText);
virtual int32_t GetType() const;
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetDOMRule();
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetExistingDOMRule();
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE;
// The new mapping function.
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
@ -368,7 +368,7 @@ public:
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
private:
~StyleRule();

60
layout/style/nsCSSRules.h
View File

@ -62,14 +62,14 @@ public:
#endif
// Rule methods
virtual void SetStyleSheet(mozilla::CSSStyleSheet* aSheet); //override GroupRule
virtual int32_t GetType() const;
virtual already_AddRefed<Rule> Clone() const;
virtual nsIDOMCSSRule* GetDOMRule()
virtual void SetStyleSheet(mozilla::CSSStyleSheet* aSheet) MOZ_OVERRIDE; //override GroupRule
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE
{
return this;
}
virtual nsIDOMCSSRule* GetExistingDOMRule()
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE
{
return this;
}
@ -88,13 +88,13 @@ public:
// rest of GroupRule
virtual bool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
nsMediaQueryResultCacheKey& aKey) MOZ_OVERRIDE;
// @media rule methods
nsresult SetMedia(nsMediaList* aMedia);
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
const MOZ_MUST_OVERRIDE;
const MOZ_OVERRIDE MOZ_MUST_OVERRIDE;
protected:
void AppendConditionText(nsAString& aOutput);
@ -120,13 +120,13 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<Rule> Clone() const;
virtual nsIDOMCSSRule* GetDOMRule()
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE
{
return this;
}
virtual nsIDOMCSSRule* GetExistingDOMRule()
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE
{
return this;
}
@ -145,7 +145,7 @@ public:
// rest of GroupRule
virtual bool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
nsMediaQueryResultCacheKey& aKey) MOZ_OVERRIDE;
enum Function {
eURL,
@ -172,7 +172,7 @@ public:
void SetURLs(URL *aURLs) { mURLs = aURLs; }
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
const MOZ_MUST_OVERRIDE;
const MOZ_OVERRIDE MOZ_MUST_OVERRIDE;
protected:
void AppendConditionText(nsAString& aOutput);
@ -259,7 +259,7 @@ public:
DECL_STYLE_RULE_INHERIT
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE
@ -381,8 +381,8 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<Rule> Clone() const;
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<Rule> Clone() const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE
@ -391,7 +391,7 @@ public:
NS_IMETHOD GetEncoding(nsAString& aEncoding) MOZ_OVERRIDE;
NS_IMETHOD SetEncoding(const nsAString& aEncoding) MOZ_OVERRIDE;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
private:
nsString mEncoding;
@ -456,7 +456,7 @@ public:
// Rule methods
DECL_STYLE_RULE_INHERIT
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE
@ -502,13 +502,13 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual nsIDOMCSSRule* GetDOMRule()
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE
{
return this;
}
virtual nsIDOMCSSRule* GetExistingDOMRule()
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE
{
return this;
}
@ -588,7 +588,7 @@ public:
// Rule methods
DECL_STYLE_RULE_INHERIT
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE
@ -626,15 +626,15 @@ public:
#endif
// Rule methods
virtual int32_t GetType() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
virtual bool UseForPresentation(nsPresContext* aPresContext,
nsMediaQueryResultCacheKey& aKey);
virtual nsIDOMCSSRule* GetDOMRule()
nsMediaQueryResultCacheKey& aKey) MOZ_OVERRIDE;
virtual nsIDOMCSSRule* GetDOMRule() MOZ_OVERRIDE
{
return this;
}
virtual nsIDOMCSSRule* GetExistingDOMRule()
virtual nsIDOMCSSRule* GetExistingDOMRule() MOZ_OVERRIDE
{
return this;
}
@ -653,7 +653,7 @@ public:
// nsIDOMCSSSupportsRule interface
NS_DECL_NSIDOMCSSSUPPORTSRULE
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
protected:
virtual ~CSSSupportsRule();
@ -691,7 +691,7 @@ public:
// Rule methods
DECL_STYLE_RULE_INHERIT
virtual int32_t GetType() const MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::css::Rule> Clone() const;
virtual already_AddRefed<mozilla::css::Rule> Clone() const MOZ_OVERRIDE;
// nsIDOMCSSRule interface
NS_DECL_NSIDOMCSSRULE

2
layout/style/nsDOMCSSAttrDeclaration.h
View File

@ -31,7 +31,7 @@ public:
// If GetCSSDeclaration returns non-null, then the decl it returns
// is owned by our current style rule.
virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate);
virtual mozilla::css::Declaration* GetCSSDeclaration(bool aAllocate) MOZ_OVERRIDE;
virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) MOZ_OVERRIDE;
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) MOZ_OVERRIDE;

24
layout/style/nsICSSDeclaration.h
View File

@ -155,21 +155,21 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsICSSDeclaration, NS_ICSSDECLARATION_IID)
#define NS_DECL_NSICSSDECLARATION \
NS_IMETHOD GetPropertyValue(const nsCSSProperty aPropID, \
nsAString& aValue); \
nsAString& aValue) MOZ_OVERRIDE; \
NS_IMETHOD GetAuthoredPropertyValue(const nsAString& aPropName, \
nsAString& aValue); \
nsAString& aValue) MOZ_OVERRIDE; \
NS_IMETHOD SetPropertyValue(const nsCSSProperty aPropID, \
const nsAString& aValue);
const nsAString& aValue) MOZ_OVERRIDE;
#define NS_DECL_NSIDOMCSSSTYLEDECLARATION_HELPER \
NS_IMETHOD GetCssText(nsAString & aCssText); \
NS_IMETHOD SetCssText(const nsAString & aCssText); \
NS_IMETHOD GetPropertyValue(const nsAString & propertyName, nsAString & _retval); \
NS_IMETHOD RemoveProperty(const nsAString & propertyName, nsAString & _retval); \
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName, nsAString & _retval); \
NS_IMETHOD SetProperty(const nsAString & propertyName, const nsAString & value, const nsAString & priority); \
NS_IMETHOD GetLength(uint32_t *aLength); \
NS_IMETHOD Item(uint32_t index, nsAString & _retval); \
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule);
NS_IMETHOD GetCssText(nsAString & aCssText) MOZ_OVERRIDE; \
NS_IMETHOD SetCssText(const nsAString & aCssText) MOZ_OVERRIDE; \
NS_IMETHOD GetPropertyValue(const nsAString & propertyName, nsAString & _retval) MOZ_OVERRIDE; \
NS_IMETHOD RemoveProperty(const nsAString & propertyName, nsAString & _retval) MOZ_OVERRIDE; \
NS_IMETHOD GetPropertyPriority(const nsAString & propertyName, nsAString & _retval) MOZ_OVERRIDE; \
NS_IMETHOD SetProperty(const nsAString & propertyName, const nsAString & value, const nsAString & priority) MOZ_OVERRIDE; \
NS_IMETHOD GetLength(uint32_t *aLength) MOZ_OVERRIDE; \
NS_IMETHOD Item(uint32_t index, nsAString & _retval) MOZ_OVERRIDE; \
NS_IMETHOD GetParentRule(nsIDOMCSSRule * *aParentRule) MOZ_OVERRIDE;
#endif // nsICSSDeclaration_h__