Index: Source/core/html/parser/HTMLDocumentParser.h |
diff --git a/Source/core/html/parser/HTMLDocumentParser.h b/Source/core/html/parser/HTMLDocumentParser.h |
index 5b9daa2a4e8b1678fcebd4bf15e50636e2ae025b..6af55fbd35ec4767831cb5dc6594182e1919df10 100644 |
--- a/Source/core/html/parser/HTMLDocumentParser.h |
+++ b/Source/core/html/parser/HTMLDocumentParser.h |
@@ -65,7 +65,7 @@ class ScriptSourceCode; |
class PumpSession; |
-class HTMLDocumentParser : public ScriptableDocumentParser, HTMLScriptRunnerHost, ResourceClient { |
+class HTMLDocumentParser : public ScriptableDocumentParser, private HTMLScriptRunnerHost { |
WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
public: |
static PassRefPtrWillBeRawPtr<HTMLDocumentParser> create(HTMLDocument& document, bool reportErrors) |
@@ -136,14 +136,12 @@ private: |
virtual void executeScriptsWaitingForResources() OVERRIDE FINAL; |
// HTMLScriptRunnerHost |
- virtual void watchForLoad(Resource*) OVERRIDE FINAL; |
- virtual void stopWatchingForLoad(Resource*) OVERRIDE FINAL; |
+ virtual void notifyScriptLoaded(Resource*) OVERRIDE FINAL; |
virtual HTMLInputStream& inputStream() OVERRIDE FINAL { return m_input; } |
virtual bool hasPreloadScanner() const OVERRIDE FINAL { return m_preloadScanner.get() && !shouldUseThreading(); } |
virtual void appendCurrentInputStreamToPreloadScannerAndScan() OVERRIDE FINAL; |
// ResourceClient |
sof
2014/05/27 08:41:19
Will remove this line.
|
- virtual void notifyFinished(Resource*) OVERRIDE FINAL; |
void startBackgroundParser(); |
void stopBackgroundParser(); |
@@ -186,7 +184,7 @@ private: |
OwnPtr<HTMLToken> m_token; |
OwnPtr<HTMLTokenizer> m_tokenizer; |
- OwnPtr<HTMLScriptRunner> m_scriptRunner; |
+ OwnPtrWillBeMember<HTMLScriptRunner> m_scriptRunner; |
OwnPtrWillBeMember<HTMLTreeBuilder> m_treeBuilder; |
OwnPtr<HTMLPreloadScanner> m_preloadScanner; |
OwnPtr<HTMLPreloadScanner> m_insertionPreloadScanner; |