mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1118417 - Mark virtual overridden functions as MOZ_OVERRIDE in parser; r=hsivonen

This commit is contained in:
Ehsan Akhgari 2015-01-06 15:11:44 -05:00
Родитель 4f019cb59b
Коммит dafe75ef66
11 изменённых файлов: 105 добавлений и 124 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
parser/html/nsHtml5DocumentBuilder.h
Просмотреть файл

@ -102,8 +102,8 @@ public:
}
// nsContentSink methods
virtual void UpdateChildCounts();
virtual nsresult FlushTags();
virtual void UpdateChildCounts() MOZ_OVERRIDE;
virtual nsresult FlushTags() MOZ_OVERRIDE;
protected:

2
parser/html/nsHtml5Module.cpp
Просмотреть файл

@ -92,7 +92,7 @@ class nsHtml5ParserThreadTerminator MOZ_FINAL : public nsIObserver
explicit nsHtml5ParserThreadTerminator(nsIThread* aThread)
: mThread(aThread)
{}
NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *)
NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *) MOZ_OVERRIDE
{
NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"),
"Unexpected topic");

10
parser/html/nsHtml5Parser.cpp
Просмотреть файл

@ -188,7 +188,7 @@ nsHtml5Parser::Parse(nsIURI* aURL,
return NS_OK;
}
NS_IMETHODIMP
nsresult
nsHtml5Parser::Parse(const nsAString& aSourceBuffer,
void* aKey,
const nsACString& aContentType,
@ -535,14 +535,6 @@ nsHtml5Parser::Reset()
NS_NOTREACHED("Don't call this!");
}
bool
nsHtml5Parser::CanInterrupt()
{
// nsContentSink needs this to let nsContentSink::DidProcessATokenImpl
// interrupt.
return true;
}
bool
nsHtml5Parser::IsInsertionPointDefined()
{

61
parser/html/nsHtml5Parser.h
Просмотреть файл

@ -42,27 +42,27 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
/**
* No-op for backwards compat.
*/
NS_IMETHOD_(void) SetContentSink(nsIContentSink* aSink);
NS_IMETHOD_(void) SetContentSink(nsIContentSink* aSink) MOZ_OVERRIDE;
/**
* Returns the tree op executor for backwards compat.
*/
NS_IMETHOD_(nsIContentSink*) GetContentSink();
NS_IMETHOD_(nsIContentSink*) GetContentSink() MOZ_OVERRIDE;
/**
* Always returns "view" for backwards compat.
*/
NS_IMETHOD_(void) GetCommand(nsCString& aCommand);
NS_IMETHOD_(void) GetCommand(nsCString& aCommand) MOZ_OVERRIDE;
/**
* No-op for backwards compat.
*/
NS_IMETHOD_(void) SetCommand(const char* aCommand);
NS_IMETHOD_(void) SetCommand(const char* aCommand) MOZ_OVERRIDE;
/**
* No-op for backwards compat.
*/
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand);
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand) MOZ_OVERRIDE;
/**
* Call this method once you've created a parser, and want to instruct it
@ -71,12 +71,12 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
* @param aCharset the charset of a document
* @param aCharsetSource the source of the charset
*/
NS_IMETHOD_(void) SetDocumentCharset(const nsACString& aCharset, int32_t aSource);
NS_IMETHOD_(void) SetDocumentCharset(const nsACString& aCharset, int32_t aSource) MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
NS_IMETHOD_(void) GetDocumentCharset(nsACString& aCharset, int32_t& aSource)
NS_IMETHOD_(void) GetDocumentCharset(nsACString& aCharset, int32_t& aSource) MOZ_OVERRIDE
{
NS_NOTREACHED("No one should call this.");
}
@ -86,47 +86,47 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
* @param aChannel out param that will contain the result
* @return NS_OK if successful or NS_NOT_AVAILABLE if not
*/
NS_IMETHOD GetChannel(nsIChannel** aChannel);
NS_IMETHOD GetChannel(nsIChannel** aChannel) MOZ_OVERRIDE;
/**
* Return |this| for backwards compat.
*/
NS_IMETHOD GetDTD(nsIDTD** aDTD);
NS_IMETHOD GetDTD(nsIDTD** aDTD) MOZ_OVERRIDE;
/**
* Get the stream parser for this parser
*/
virtual nsIStreamListener* GetStreamListener();
virtual nsIStreamListener* GetStreamListener() MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
NS_IMETHOD ContinueInterruptedParsing();
NS_IMETHOD ContinueInterruptedParsing() MOZ_OVERRIDE;
/**
* Blocks the parser.
*/
NS_IMETHOD_(void) BlockParser();
NS_IMETHOD_(void) BlockParser() MOZ_OVERRIDE;
/**
* Unblocks the parser.
*/
NS_IMETHOD_(void) UnblockParser();
NS_IMETHOD_(void) UnblockParser() MOZ_OVERRIDE;
/**
* Asynchronously continues parsing.
*/
NS_IMETHOD_(void) ContinueInterruptedParsingAsync();
NS_IMETHOD_(void) ContinueInterruptedParsingAsync() MOZ_OVERRIDE;
/**
* Query whether the parser is enabled (i.e. not blocked) or not.
*/
NS_IMETHOD_(bool) IsParserEnabled();
NS_IMETHOD_(bool) IsParserEnabled() MOZ_OVERRIDE;
/**
* Query whether the parser thinks it's done with parsing.
*/
NS_IMETHOD_(bool) IsComplete();
NS_IMETHOD_(bool) IsComplete() MOZ_OVERRIDE;
/**
* Set up request observer.
@ -139,7 +139,7 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
NS_IMETHOD Parse(nsIURI* aURL,
nsIRequestObserver* aListener = nullptr,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect);
nsDTDMode aMode = eDTDMode_autodetect) MOZ_OVERRIDE;
/**
* document.write and document.close
@ -150,7 +150,7 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
* @param aLastCall true if .close() false if .write()
* @param aMode ignored (for interface compat only)
*/
NS_IMETHOD Parse(const nsAString& aSourceBuffer,
nsresult Parse(const nsAString& aSourceBuffer,
void* aKey,
const nsACString& aContentType,
bool aLastCall,
@ -159,48 +159,43 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
/**
* Stops the parser prematurely
*/
NS_IMETHOD Terminate();
NS_IMETHOD Terminate() MOZ_OVERRIDE;
/**
* Don't call. For interface backwards compat only.
*/
NS_IMETHOD ParseFragment(const nsAString& aSourceBuffer,
nsTArray<nsString>& aTagStack);
nsTArray<nsString>& aTagStack) MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
NS_IMETHOD BuildModel();
NS_IMETHOD BuildModel() MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
NS_IMETHODIMP CancelParsingEvents();
NS_IMETHODIMP CancelParsingEvents() MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
virtual void Reset();
/**
* True in fragment mode and during synchronous document.write
*/
virtual bool CanInterrupt();
virtual void Reset() MOZ_OVERRIDE;
/**
* True if the insertion point (per HTML5) is defined.
*/
virtual bool IsInsertionPointDefined();
virtual bool IsInsertionPointDefined() MOZ_OVERRIDE;
/**
* Call immediately before starting to evaluate a parser-inserted script.
*/
virtual void BeginEvaluatingParserInsertedScript();
virtual void BeginEvaluatingParserInsertedScript() MOZ_OVERRIDE;
/**
* Call immediately after having evaluated a parser-inserted script.
*/
virtual void EndEvaluatingParserInsertedScript();
virtual void EndEvaluatingParserInsertedScript() MOZ_OVERRIDE;
/**
* Marks the HTML5 parser as not a script-created parser: Prepares the
@ -209,12 +204,12 @@ class nsHtml5Parser MOZ_FINAL : public nsIParser,
* @param aCommand the parser command (Yeah, this is bad API design. Let's
* make this better when retiring nsIParser)
*/
virtual void MarkAsNotScriptCreated(const char* aCommand);
virtual void MarkAsNotScriptCreated(const char* aCommand) MOZ_OVERRIDE;
/**
* True if this is a script-created HTML5 parser.
*/
virtual bool IsScriptCreated();
virtual bool IsScriptCreated() MOZ_OVERRIDE;
/* End nsIParser */

2
parser/html/nsHtml5StreamParser.h
Просмотреть файл

@ -137,7 +137,7 @@ class nsHtml5StreamParser : public nsICharsetDetectionObserver {
/**
* Chardet calls this to report the detection result
*/
NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf);
NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf) MOZ_OVERRIDE;
// EncodingDeclarationHandler
// http://hg.mozilla.org/projects/htmlparser/file/tip/src/nu/validator/htmlparser/common/EncodingDeclarationHandler.java

32
parser/html/nsHtml5TreeOpExecutor.h
Просмотреть файл

@ -109,42 +109,42 @@ class nsHtml5TreeOpExecutor MOZ_FINAL : public nsHtml5DocumentBuilder,
/**
* Unimplemented. For interface compat only.
*/
NS_IMETHOD WillParse();
NS_IMETHOD WillParse() MOZ_OVERRIDE;
/**
*
*/
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode);
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode) MOZ_OVERRIDE;
/**
* Emits EOF.
*/
NS_IMETHOD DidBuildModel(bool aTerminated);
NS_IMETHOD DidBuildModel(bool aTerminated) MOZ_OVERRIDE;
/**
* Forwards to nsContentSink
*/
NS_IMETHOD WillInterrupt();
NS_IMETHOD WillInterrupt() MOZ_OVERRIDE;
/**
* Unimplemented. For interface compat only.
*/
NS_IMETHOD WillResume();
NS_IMETHOD WillResume() MOZ_OVERRIDE;
/**
* Sets the parser.
*/
NS_IMETHOD SetParser(nsParserBase* aParser);
NS_IMETHOD SetParser(nsParserBase* aParser) MOZ_OVERRIDE;
/**
* No-op for backwards compat.
*/
virtual void FlushPendingNotifications(mozFlushType aType);
virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE;
/**
* Don't call. For interface compat only.
*/
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) {
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) MOZ_OVERRIDE {
NS_NOTREACHED("No one should call this.");
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -152,17 +152,11 @@ class nsHtml5TreeOpExecutor MOZ_FINAL : public nsHtml5DocumentBuilder,
/**
* Returns the document.
*/
virtual nsISupports *GetTarget();
virtual nsISupports *GetTarget() MOZ_OVERRIDE;
virtual void ContinueInterruptedParsingAsync();
virtual void ContinueInterruptedParsingAsync() MOZ_OVERRIDE;
// XXX Does anyone need this?
nsIDocShell* GetDocShell()
{
return mDocShell;
}
bool IsScriptExecuting()
bool IsScriptExecuting() MOZ_OVERRIDE
{
return IsScriptExecutingImpl();
}
@ -178,7 +172,7 @@ class nsHtml5TreeOpExecutor MOZ_FINAL : public nsHtml5DocumentBuilder,
bool IsScriptEnabled();
virtual nsresult MarkAsBroken(nsresult aReason);
virtual nsresult MarkAsBroken(nsresult aReason) MOZ_OVERRIDE;
void StartLayout();
@ -230,7 +224,7 @@ class nsHtml5TreeOpExecutor MOZ_FINAL : public nsHtml5DocumentBuilder,
* Flush the operations from the tree operations from the argument
* queue unconditionally. (This is for the main thread case.)
*/
virtual void MoveOpsFrom(nsTArray<nsHtml5TreeOperation>& aOpQueue);
virtual void MoveOpsFrom(nsTArray<nsHtml5TreeOperation>& aOpQueue) MOZ_OVERRIDE;
nsHtml5TreeOpStage* GetStage()
{

16
parser/htmlparser/nsIDTD.h
Просмотреть файл

@ -127,12 +127,12 @@ public:
NS_DEFINE_STATIC_IID_ACCESSOR(nsIDTD, NS_IDTD_IID)
#define NS_DECL_NSIDTD \
NS_IMETHOD WillBuildModel( const CParserContext& aParserContext, nsITokenizer* aTokenizer, nsIContentSink* aSink);\
NS_IMETHOD DidBuildModel(nsresult anErrorCode);\
NS_IMETHOD BuildModel(nsITokenizer* aTokenizer, nsIContentSink* aSink);\
NS_IMETHOD_(bool) CanContain(int32_t aParent,int32_t aChild) const;\
NS_IMETHOD_(bool) IsContainer(int32_t aTag) const;\
NS_IMETHOD_(void) Terminate();\
NS_IMETHOD_(int32_t) GetType();\
NS_IMETHOD_(nsDTDMode) GetMode() const;
NS_IMETHOD WillBuildModel( const CParserContext& aParserContext, nsITokenizer* aTokenizer, nsIContentSink* aSink) MOZ_OVERRIDE;\
NS_IMETHOD DidBuildModel(nsresult anErrorCode) MOZ_OVERRIDE;\
NS_IMETHOD BuildModel(nsITokenizer* aTokenizer, nsIContentSink* aSink) MOZ_OVERRIDE;\
NS_IMETHOD_(bool) CanContain(int32_t aParent,int32_t aChild) const MOZ_OVERRIDE;\
NS_IMETHOD_(bool) IsContainer(int32_t aTag) const MOZ_OVERRIDE;\
NS_IMETHOD_(void) Terminate() MOZ_OVERRIDE;\
NS_IMETHOD_(int32_t) GetType() MOZ_OVERRIDE;\
NS_IMETHOD_(nsDTDMode) GetMode() const MOZ_OVERRIDE;
#endif /* nsIDTD_h___ */

4
parser/htmlparser/nsITokenizer.h
Просмотреть файл

@ -37,8 +37,8 @@ public:
NS_DEFINE_STATIC_IID_ACCESSOR(nsITokenizer, NS_ITOKENIZER_IID)
#define NS_DECL_NSITOKENIZER \
NS_IMETHOD WillTokenize(bool aIsFinalChunk);\
NS_IMETHOD ConsumeToken(nsScanner& aScanner,bool& aFlushTokens);\
NS_IMETHOD WillTokenize(bool aIsFinalChunk) MOZ_OVERRIDE;\
NS_IMETHOD ConsumeToken(nsScanner& aScanner,bool& aFlushTokens) MOZ_OVERRIDE;\
#endif

54
parser/htmlparser/nsParser.h
Просмотреть файл

@ -98,7 +98,7 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aSink is the new sink to be used by parser
* @return old sink, or nullptr
*/
NS_IMETHOD_(void) SetContentSink(nsIContentSink* aSink);
NS_IMETHOD_(void) SetContentSink(nsIContentSink* aSink) MOZ_OVERRIDE;
/**
* retrive the sink set into the parser
@ -106,7 +106,7 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aSink is the new sink to be used by parser
* @return old sink, or nullptr
*/
NS_IMETHOD_(nsIContentSink*) GetContentSink(void);
NS_IMETHOD_(nsIContentSink*) GetContentSink(void) MOZ_OVERRIDE;
/**
* Call this method once you've created a parser, and want to instruct it
@ -117,9 +117,9 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aCommand -- ptrs to string that contains command
* @return nada
*/
NS_IMETHOD_(void) GetCommand(nsCString& aCommand);
NS_IMETHOD_(void) SetCommand(const char* aCommand);
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand);
NS_IMETHOD_(void) GetCommand(nsCString& aCommand) MOZ_OVERRIDE;
NS_IMETHOD_(void) SetCommand(const char* aCommand) MOZ_OVERRIDE;
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand) MOZ_OVERRIDE;
/**
* Call this method once you've created a parser, and want to instruct it
@ -130,9 +130,9 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aCharsetSource- the source of the charset
* @return nada
*/
NS_IMETHOD_(void) SetDocumentCharset(const nsACString& aCharset, int32_t aSource);
NS_IMETHOD_(void) SetDocumentCharset(const nsACString& aCharset, int32_t aSource) MOZ_OVERRIDE;
NS_IMETHOD_(void) GetDocumentCharset(nsACString& aCharset, int32_t& aSource)
NS_IMETHOD_(void) GetDocumentCharset(nsACString& aCharset, int32_t& aSource) MOZ_OVERRIDE
{
aCharset = mCharset;
aSource = mCharsetSource;
@ -148,13 +148,13 @@ class nsParser MOZ_FINAL : public nsIParser,
NS_IMETHOD Parse(nsIURI* aURL,
nsIRequestObserver* aListener = nullptr,
void* aKey = 0,
nsDTDMode aMode = eDTDMode_autodetect);
nsDTDMode aMode = eDTDMode_autodetect) MOZ_OVERRIDE;
/**
* This method needs documentation
*/
NS_IMETHOD ParseFragment(const nsAString& aSourceBuffer,
nsTArray<nsString>& aTagStack);
nsTArray<nsString>& aTagStack) MOZ_OVERRIDE;
/**
* This method gets called when the tokens have been consumed, and it's time
@ -162,13 +162,13 @@ class nsParser MOZ_FINAL : public nsIParser,
* @update gess5/11/98
* @return YES if model building went well -- NO otherwise.
*/
NS_IMETHOD BuildModel(void);
NS_IMETHOD BuildModel(void) MOZ_OVERRIDE;
NS_IMETHOD ContinueInterruptedParsing();
NS_IMETHOD_(void) BlockParser();
NS_IMETHOD_(void) UnblockParser();
NS_IMETHOD_(void) ContinueInterruptedParsingAsync();
NS_IMETHOD Terminate(void);
NS_IMETHOD ContinueInterruptedParsing() MOZ_OVERRIDE;
NS_IMETHOD_(void) BlockParser() MOZ_OVERRIDE;
NS_IMETHOD_(void) UnblockParser() MOZ_OVERRIDE;
NS_IMETHOD_(void) ContinueInterruptedParsingAsync() MOZ_OVERRIDE;
NS_IMETHOD Terminate(void) MOZ_OVERRIDE;
/**
* Call this to query whether the parser is enabled or not.
@ -176,7 +176,7 @@ class nsParser MOZ_FINAL : public nsIParser,
* @update vidur 4/12/99
* @return current state
*/
NS_IMETHOD_(bool) IsParserEnabled();
NS_IMETHOD_(bool) IsParserEnabled() MOZ_OVERRIDE;
/**
* Call this to query whether the parser thinks it's done with parsing.
@ -184,7 +184,7 @@ class nsParser MOZ_FINAL : public nsIParser,
* @update rickg 5/12/01
* @return complete state
*/
NS_IMETHOD_(bool) IsComplete();
NS_IMETHOD_(bool) IsComplete() MOZ_OVERRIDE;
/**
* This rather arcane method (hack) is used as a signal between the
@ -227,7 +227,7 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aChannel out param that will contain the result
* @return NS_OK if successful
*/
NS_IMETHOD GetChannel(nsIChannel** aChannel);
NS_IMETHOD GetChannel(nsIChannel** aChannel) MOZ_OVERRIDE;
/**
* Get the DTD associated with this parser
@ -235,12 +235,12 @@ class nsParser MOZ_FINAL : public nsIParser,
* @param aDTD out param that will contain the result
* @return NS_OK if successful, NS_ERROR_FAILURE for runtime error
*/
NS_IMETHOD GetDTD(nsIDTD** aDTD);
NS_IMETHOD GetDTD(nsIDTD** aDTD) MOZ_OVERRIDE;
/**
* Get the nsIStreamListener for this parser
*/
virtual nsIStreamListener* GetStreamListener();
virtual nsIStreamListener* GetStreamListener() MOZ_OVERRIDE;
void SetSinkCharset(nsACString& aCharset);
@ -249,32 +249,32 @@ class nsParser MOZ_FINAL : public nsIParser,
* @update kmcclusk 5/18/98
*/
NS_IMETHODIMP CancelParsingEvents();
NS_IMETHODIMP CancelParsingEvents() MOZ_OVERRIDE;
/**
* Return true.
*/
virtual bool IsInsertionPointDefined();
virtual bool IsInsertionPointDefined() MOZ_OVERRIDE;
/**
* No-op.
*/
virtual void BeginEvaluatingParserInsertedScript();
virtual void BeginEvaluatingParserInsertedScript() MOZ_OVERRIDE;
/**
* No-op.
*/
virtual void EndEvaluatingParserInsertedScript();
virtual void EndEvaluatingParserInsertedScript() MOZ_OVERRIDE;
/**
* No-op.
*/
virtual void MarkAsNotScriptCreated(const char* aCommand);
virtual void MarkAsNotScriptCreated(const char* aCommand) MOZ_OVERRIDE;
/**
* Always false.
*/
virtual bool IsScriptCreated();
virtual bool IsScriptCreated() MOZ_OVERRIDE;
/**
* Set to parser state to indicate whether parsing tokens can be interrupted
@ -299,7 +299,7 @@ class nsParser MOZ_FINAL : public nsIParser,
*/
void HandleParserContinueEvent(class nsParserContinueEvent *);
virtual void Reset() {
virtual void Reset() MOZ_OVERRIDE {
Cleanup();
Initialize();
}

18
parser/htmlparser/nsParserService.h
Просмотреть файл

@ -21,22 +21,22 @@ public:
NS_DECL_ISUPPORTS
int32_t HTMLAtomTagToId(nsIAtom* aAtom) const;
int32_t HTMLAtomTagToId(nsIAtom* aAtom) const MOZ_OVERRIDE;
int32_t HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom) const;
int32_t HTMLCaseSensitiveAtomTagToId(nsIAtom* aAtom) const MOZ_OVERRIDE;
int32_t HTMLStringTagToId(const nsAString& aTag) const;
int32_t HTMLStringTagToId(const nsAString& aTag) const MOZ_OVERRIDE;
const char16_t *HTMLIdToStringTag(int32_t aId) const;
const char16_t *HTMLIdToStringTag(int32_t aId) const MOZ_OVERRIDE;
nsIAtom *HTMLIdToAtomTag(int32_t aId) const;
nsIAtom *HTMLIdToAtomTag(int32_t aId) const MOZ_OVERRIDE;
NS_IMETHOD HTMLConvertEntityToUnicode(const nsAString& aEntity,
int32_t* aUnicode) const;
int32_t* aUnicode) const MOZ_OVERRIDE;
NS_IMETHOD HTMLConvertUnicodeToEntity(int32_t aUnicode,
nsCString& aEntity) const;
NS_IMETHOD IsContainer(int32_t aId, bool& aIsContainer) const;
NS_IMETHOD IsBlock(int32_t aId, bool& aIsBlock) const;
nsCString& aEntity) const MOZ_OVERRIDE;
NS_IMETHOD IsContainer(int32_t aId, bool& aIsContainer) const MOZ_OVERRIDE;
NS_IMETHOD IsBlock(int32_t aId, bool& aIsBlock) const MOZ_OVERRIDE;
};
#endif

18
parser/xml/nsSAXXMLReader.h
Просмотреть файл

@ -41,35 +41,35 @@ public:
nsSAXXMLReader();
//nsIContentSink
NS_IMETHOD WillParse()
NS_IMETHOD WillParse() MOZ_OVERRIDE
{
return NS_OK;
}
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode);
NS_IMETHOD DidBuildModel(bool aTerminated);
NS_IMETHOD SetParser(nsParserBase* aParser);
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode) MOZ_OVERRIDE;
NS_IMETHOD DidBuildModel(bool aTerminated) MOZ_OVERRIDE;
NS_IMETHOD SetParser(nsParserBase* aParser) MOZ_OVERRIDE;
NS_IMETHOD WillInterrupt()
NS_IMETHOD WillInterrupt() MOZ_OVERRIDE
{
return NS_OK;
}
NS_IMETHOD WillResume()
NS_IMETHOD WillResume() MOZ_OVERRIDE
{
return NS_OK;
}
virtual void FlushPendingNotifications(mozFlushType aType)
virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE
{
}
NS_IMETHOD SetDocumentCharset(nsACString& aCharset)
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) MOZ_OVERRIDE
{
return NS_OK;
}
virtual nsISupports *GetTarget()
virtual nsISupports *GetTarget() MOZ_OVERRIDE
{
return nullptr;
}