wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1118551 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/xslt; r=baku

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 19:54:22 -05:00
parent 9dcb1845c0
commit 3015ddd77e
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/xslt/xpath/XPathResult.h
View File

@ -77,7 +77,7 @@ public:
return static_cast<XPathResult*>(static_cast<nsIXPathResult*>(aSupports));
}
virtual JSObject* WrapObject(JSContext* aCx);
virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
nsINode* GetParentObject() const
{
return mParent;

23
dom/xslt/xpath/txExpr.h
View File

@ -139,29 +139,28 @@ public:
#ifdef TX_TO_STRING
#define TX_DECL_TOSTRING \
void toString(nsAString& aDest);
void toString(nsAString& aDest) MOZ_OVERRIDE;
#define TX_DECL_GETNAMEATOM \
nsresult getNameAtom(nsIAtom** aAtom);
nsresult getNameAtom(nsIAtom** aAtom) MOZ_OVERRIDE;
#else
#define TX_DECL_TOSTRING
#define TX_DECL_GETNAMEATOM
#endif
#define TX_DECL_EXPR_BASE \
nsresult evaluate(txIEvalContext* aContext, txAExprResult** aResult); \
ResultType getReturnType(); \
bool isSensitiveTo(ContextSensitivity aContexts);
nsresult evaluate(txIEvalContext* aContext, txAExprResult** aResult) MOZ_OVERRIDE; \
ResultType getReturnType() MOZ_OVERRIDE; \
bool isSensitiveTo(ContextSensitivity aContexts) MOZ_OVERRIDE;
#define TX_DECL_EXPR \
TX_DECL_EXPR_BASE \
TX_DECL_TOSTRING \
Expr* getSubExprAt(uint32_t aPos); \
void setSubExprAt(uint32_t aPos, Expr* aExpr);
Expr* getSubExprAt(uint32_t aPos) MOZ_OVERRIDE; \
void setSubExprAt(uint32_t aPos, Expr* aExpr) MOZ_OVERRIDE;
#define TX_DECL_OPTIMIZABLE_EXPR \
TX_DECL_EXPR \
ExprType getType();
ExprType getType() MOZ_OVERRIDE;
#define TX_DECL_FUNCTION \
TX_DECL_GETNAMEATOM \
@ -426,9 +425,9 @@ public:
#define TX_DECL_NODE_TEST \
TX_DECL_TOSTRING \
bool matches(const txXPathNode& aNode, txIMatchContext* aContext); \
double getDefaultPriority(); \
bool isSensitiveTo(Expr::ContextSensitivity aContext);
bool matches(const txXPathNode& aNode, txIMatchContext* aContext) MOZ_OVERRIDE; \
double getDefaultPriority() MOZ_OVERRIDE; \
bool isSensitiveTo(Expr::ContextSensitivity aContext) MOZ_OVERRIDE;
/*
* This class represents a NameTest as defined by the XPath spec

2
dom/xslt/xpath/txXPathObjectAdaptor.h
View File

@ -27,7 +27,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP_(txAExprResult*) GetResult()
NS_IMETHODIMP_(txAExprResult*) GetResult() MOZ_OVERRIDE
{
return mValue;
}

16
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
View File

@ -79,14 +79,14 @@ public:
NS_DECL_NSIINTERFACEREQUESTOR
// nsIContentSink
NS_IMETHOD WillParse(void) { return NS_OK; }
NS_IMETHOD DidBuildModel(bool aTerminated);
NS_IMETHOD WillInterrupt(void) { return NS_OK; }
NS_IMETHOD WillResume(void) { return NS_OK; }
NS_IMETHOD SetParser(nsParserBase* aParser) { return NS_OK; }
virtual void FlushPendingNotifications(mozFlushType aType) { }
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) { return NS_OK; }
virtual nsISupports *GetTarget() { return nullptr; }
NS_IMETHOD WillParse(void) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD DidBuildModel(bool aTerminated) MOZ_OVERRIDE;
NS_IMETHOD WillInterrupt(void) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD WillResume(void) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD SetParser(nsParserBase* aParser) MOZ_OVERRIDE { return NS_OK; }
virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE { }
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) MOZ_OVERRIDE { return NS_OK; }
virtual nsISupports *GetTarget() MOZ_OVERRIDE { return nullptr; }
private:
nsRefPtr<txStylesheetCompiler> mCompiler;

14
dom/xslt/xslt/txXSLTPatterns.h
View File

@ -88,19 +88,19 @@ public:
};
#define TX_DECL_PATTERN_BASE \
bool matches(const txXPathNode& aNode, txIMatchContext* aContext); \
double getDefaultPriority(); \
virtual Expr* getSubExprAt(uint32_t aPos); \
virtual void setSubExprAt(uint32_t aPos, Expr* aExpr); \
virtual txPattern* getSubPatternAt(uint32_t aPos); \
virtual void setSubPatternAt(uint32_t aPos, txPattern* aPattern)
bool matches(const txXPathNode& aNode, txIMatchContext* aContext) MOZ_OVERRIDE; \
double getDefaultPriority() MOZ_OVERRIDE; \
virtual Expr* getSubExprAt(uint32_t aPos) MOZ_OVERRIDE; \
virtual void setSubExprAt(uint32_t aPos, Expr* aExpr) MOZ_OVERRIDE; \
virtual txPattern* getSubPatternAt(uint32_t aPos) MOZ_OVERRIDE; \
virtual void setSubPatternAt(uint32_t aPos, txPattern* aPattern) MOZ_OVERRIDE
#ifndef TX_TO_STRING
#define TX_DECL_PATTERN TX_DECL_PATTERN_BASE
#else
#define TX_DECL_PATTERN \
TX_DECL_PATTERN_BASE; \
void toString(nsAString& aDest)
void toString(nsAString& aDest) MOZ_OVERRIDE
#endif
#define TX_IMPL_PATTERN_STUBS_NO_SUB_EXPR(_class) \