From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/html/parser/HTMLDocumentParser.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/html/parser/HTMLDocumentParser.h') diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.h b/Source/WebCore/html/parser/HTMLDocumentParser.h index be2ca1b..4bc33e4 100644 --- a/Source/WebCore/html/parser/HTMLDocumentParser.h +++ b/Source/WebCore/html/parser/HTMLDocumentParser.h @@ -51,6 +51,8 @@ class HTMLPreloadScanner; class ScriptController; class ScriptSourceCode; +class PumpSession; + class HTMLDocumentParser : public ScriptableDocumentParser, HTMLScriptRunnerHost, CachedResourceClient { WTF_MAKE_FAST_ALLOCATED; public: @@ -116,6 +118,7 @@ private: AllowYield, ForceSynchronous, }; + bool canTakeNextToken(SynchronousMode, PumpSession&); void pumpTokenizer(SynchronousMode); void pumpTokenizerIfPossible(SynchronousMode); @@ -128,10 +131,11 @@ private: void attemptToRunDeferredScriptsAndEnd(); void end(); + bool isParsingFragment() const; bool isScheduledForResume() const; bool inScriptExecution() const; - bool inWrite() const { return m_writeNestingLevel > 0; } - bool shouldDelayEnd() const { return inWrite() || isWaitingForScripts() || inScriptExecution() || isScheduledForResume(); } + bool inPumpSession() const { return m_pumpSessionNestingLevel > 0; } + bool shouldDelayEnd() const { return inPumpSession() || isWaitingForScripts() || inScriptExecution() || isScheduledForResume(); } ScriptController* script() const; @@ -149,7 +153,7 @@ private: XSSFilter m_xssFilter; bool m_endWasDelayed; - unsigned m_writeNestingLevel; + unsigned m_pumpSessionNestingLevel; }; } -- cgit v1.1