зеркало из https://github.com/mozilla/pjs.git
Bug 521970 - Remove the ContinueParsing() method. r&sr=mrbkap.
--HG-- extra : rebase_source : 95833f94665e2c9c64a34b7e1bd827ef85a074db
This commit is contained in:
Родитель
5de0e85447
Коммит
4be5b90306
|
@ -194,13 +194,6 @@ nsHtml5Parser::GetStreamListener(nsIStreamListener** aListener)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsHtml5Parser::ContinueParsing()
|
|
||||||
{
|
|
||||||
UnblockParser();
|
|
||||||
return ContinueInterruptedParsing();
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsHtml5Parser::ContinueInterruptedParsing()
|
nsHtml5Parser::ContinueInterruptedParsing()
|
||||||
{
|
{
|
||||||
|
|
|
@ -140,11 +140,6 @@ class nsHtml5Parser : public nsIParser,
|
||||||
*/
|
*/
|
||||||
NS_IMETHOD GetStreamListener(nsIStreamListener** aListener);
|
NS_IMETHOD GetStreamListener(nsIStreamListener** aListener);
|
||||||
|
|
||||||
/**
|
|
||||||
* Unblocks parser and calls ContinueInterruptedParsing()
|
|
||||||
*/
|
|
||||||
NS_IMETHOD ContinueParsing();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If scripts are not executing, maybe flushes tree builder and parses
|
* If scripts are not executing, maybe flushes tree builder and parses
|
||||||
* until suspension.
|
* until suspension.
|
||||||
|
|
|
@ -55,9 +55,8 @@
|
||||||
#include "nsIAtom.h"
|
#include "nsIAtom.h"
|
||||||
|
|
||||||
#define NS_IPARSER_IID \
|
#define NS_IPARSER_IID \
|
||||||
{ 0xa44dc586, 0xc521, 0x40a1, \
|
{ 0x3db442c2, 0x8a4d, 0x4ce4, \
|
||||||
{ 0xa0, 0xaf, 0xbe, 0x02, 0xa5, 0x51, 0xe0, 0xb7 } }
|
{ 0x86, 0x58, 0x48, 0xee, 0x55, 0x4b, 0xbb, 0xd4 } }
|
||||||
|
|
||||||
|
|
||||||
// {41421C60-310A-11d4-816F-000064657374}
|
// {41421C60-310A-11d4-816F-000064657374}
|
||||||
#define NS_IDEBUG_DUMP_CONTENT_IID \
|
#define NS_IDEBUG_DUMP_CONTENT_IID \
|
||||||
|
@ -207,9 +206,6 @@ class nsIParser : public nsISupports {
|
||||||
* (which may or may not be a proxy for the NGLayout content model).
|
* (which may or may not be a proxy for the NGLayout content model).
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
|
|
||||||
// Call this method to resume the parser from the blocked state.
|
|
||||||
NS_IMETHOD ContinueParsing() = 0;
|
|
||||||
|
|
||||||
// Call this method to resume the parser from an unblocked state.
|
// Call this method to resume the parser from an unblocked state.
|
||||||
// This can happen, for example, if parsing was interrupted and then the
|
// This can happen, for example, if parsing was interrupted and then the
|
||||||
// consumer needed to restart the parser without waiting for more data.
|
// consumer needed to restart the parser without waiting for more data.
|
||||||
|
|
|
@ -1781,19 +1781,6 @@ nsParser::Terminate(void)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsParser::ContinueParsing()
|
|
||||||
{
|
|
||||||
if (mFlags & NS_PARSER_FLAG_PARSER_ENABLED) {
|
|
||||||
NS_WARNING("Trying to continue parsing on a unblocked parser.");
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
mFlags |= NS_PARSER_FLAG_PARSER_ENABLED;
|
|
||||||
|
|
||||||
return ContinueInterruptedParsing();
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsParser::ContinueInterruptedParsing()
|
nsParser::ContinueInterruptedParsing()
|
||||||
{
|
{
|
||||||
|
|
|
@ -229,16 +229,6 @@ class nsParser : public nsIParser,
|
||||||
*/
|
*/
|
||||||
NS_IMETHOD BuildModel(void);
|
NS_IMETHOD BuildModel(void);
|
||||||
|
|
||||||
/**
|
|
||||||
* Call this when you want control whether or not the parser will parse
|
|
||||||
* and tokenize input (TRUE), or whether it just caches input to be
|
|
||||||
* parsed later (FALSE).
|
|
||||||
*
|
|
||||||
* @update gess 9/1/98
|
|
||||||
* @param aState determines whether we parse/tokenize or just cache.
|
|
||||||
* @return current state
|
|
||||||
*/
|
|
||||||
NS_IMETHOD ContinueParsing();
|
|
||||||
NS_IMETHOD ContinueInterruptedParsing();
|
NS_IMETHOD ContinueInterruptedParsing();
|
||||||
NS_IMETHOD_(void) BlockParser();
|
NS_IMETHOD_(void) BlockParser();
|
||||||
NS_IMETHOD_(void) UnblockParser();
|
NS_IMETHOD_(void) UnblockParser();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче