diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/parser/HTMLDocumentParser.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/parser/HTMLDocumentParser.h')
| -rw-r--r-- | Source/WebCore/html/parser/HTMLDocumentParser.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.h b/Source/WebCore/html/parser/HTMLDocumentParser.h index f925269..be2ca1b 100644 --- a/Source/WebCore/html/parser/HTMLDocumentParser.h +++ b/Source/WebCore/html/parser/HTMLDocumentParser.h @@ -30,10 +30,12 @@ #include "FragmentScriptingPermission.h" #include "HTMLInputStream.h" #include "HTMLScriptRunnerHost.h" +#include "HTMLSourceTracker.h" #include "HTMLToken.h" #include "ScriptableDocumentParser.h" #include "SegmentedString.h" #include "Timer.h" +#include "XSSFilter.h" #include <wtf/OwnPtr.h> namespace WebCore { @@ -71,8 +73,11 @@ public: static bool usePreHTML5ParserQuirks(Document*); HTMLTokenizer* tokenizer() const { return m_tokenizer.get(); } + String sourceForToken(const HTMLToken&); virtual TextPosition0 textPosition() const; + virtual int lineNumber() const; + virtual void suspendScheduledTasks(); virtual void resumeScheduledTasks(); @@ -97,7 +102,6 @@ private: virtual bool isWaitingForScripts() const; virtual bool isExecutingScript() const; virtual void executeScriptsWaitingForStylesheets(); - virtual int lineNumber() const; // HTMLScriptRunnerHost virtual void watchForLoad(CachedResource*); @@ -141,6 +145,8 @@ private: OwnPtr<HTMLTreeBuilder> m_treeBuilder; OwnPtr<HTMLPreloadScanner> m_preloadScanner; OwnPtr<HTMLParserScheduler> m_parserScheduler; + HTMLSourceTracker m_sourceTracker; + XSSFilter m_xssFilter; bool m_endWasDelayed; unsigned m_writeNestingLevel; |