| Index: sky/engine/core/html/parser/HTMLDocumentParser.cpp
|
| diff --git a/sky/engine/core/html/parser/HTMLDocumentParser.cpp b/sky/engine/core/html/parser/HTMLDocumentParser.cpp
|
| index ee6ebc93975ee041221e8f4ddd83b9df9fb38316..f3e55819a6f84394ff84a5a8b903493c2ae87e7a 100644
|
| --- a/sky/engine/core/html/parser/HTMLDocumentParser.cpp
|
| +++ b/sky/engine/core/html/parser/HTMLDocumentParser.cpp
|
| @@ -46,9 +46,9 @@
|
| namespace blink {
|
|
|
| HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors)
|
| - : DecodedDataDocumentParser(document)
|
| + : DocumentParser(&document)
|
| , m_options(&document)
|
| - , m_treeBuilder(HTMLTreeBuilder::create(this, &document, reportErrors, m_options))
|
| + , m_treeBuilder(HTMLTreeBuilder::create(this, &document, reportErrors))
|
| , m_parserScheduler(HTMLParserScheduler::create(this))
|
| , m_weakFactory(this)
|
| , m_isFragment(false)
|
| @@ -56,7 +56,6 @@ HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors
|
| , m_haveBackgroundParser(false)
|
| , m_pumpSessionNestingLevel(0)
|
| {
|
| - ASSERT(shouldUseThreading());
|
| }
|
|
|
| HTMLDocumentParser::~HTMLDocumentParser()
|
| @@ -76,21 +75,13 @@ HTMLDocumentParser::~HTMLDocumentParser()
|
| #endif
|
| }
|
|
|
| -void HTMLDocumentParser::trace(Visitor* visitor)
|
| -{
|
| - visitor->trace(m_treeBuilder);
|
| - DecodedDataDocumentParser::trace(visitor);
|
| -}
|
| -
|
| void HTMLDocumentParser::parse(mojo::ScopedDataPipeConsumerHandle source)
|
| {
|
| ASSERT(!isStopped());
|
| - ASSERT(shouldUseThreading());
|
| ASSERT(!m_haveBackgroundParser);
|
| m_haveBackgroundParser = true;
|
|
|
| OwnPtr<BackgroundHTMLParser::Configuration> config = adoptPtr(new BackgroundHTMLParser::Configuration);
|
| - config->options = m_options;
|
| config->source = source.Pass();
|
| config->parser = m_weakFactory.createWeakPtr();
|
|
|
| @@ -231,7 +222,6 @@ void HTMLDocumentParser::processParsedChunkFromBackgroundParser(PassOwnPtr<Parse
|
| // ASSERT that this object is both attached to the Document and protected.
|
| ASSERT(refCount() >= 2);
|
| #endif
|
| - ASSERT(shouldUseThreading());
|
| ASSERT(!m_lastChunkBeforeScript);
|
|
|
| ActiveParserSession session(contextForParsingSession());
|
| @@ -356,7 +346,6 @@ void HTMLDocumentParser::startBackgroundParser()
|
|
|
| void HTMLDocumentParser::stopBackgroundParser()
|
| {
|
| - ASSERT(shouldUseThreading());
|
| ASSERT(m_haveBackgroundParser);
|
| m_haveBackgroundParser = false;
|
|
|
|
|