Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(862)

Unified Diff: sky/engine/core/html/parser/HTMLDocumentParser.cpp

Issue 676133002: Remove HTMLParserOptions (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e885ec4a870720745a56fb66daccccc5712a0420..9f5f9227b5e7d5aa1db10128383348322812c791 100644
--- a/sky/engine/core/html/parser/HTMLDocumentParser.cpp
+++ b/sky/engine/core/html/parser/HTMLDocumentParser.cpp
@@ -47,8 +47,7 @@ namespace blink {
HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors)
: 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 +55,6 @@ HTMLDocumentParser::HTMLDocumentParser(HTMLDocument& document, bool reportErrors
, m_haveBackgroundParser(false)
, m_pumpSessionNestingLevel(0)
{
- ASSERT(shouldUseThreading());
}
HTMLDocumentParser::~HTMLDocumentParser()
@@ -79,12 +77,10 @@ HTMLDocumentParser::~HTMLDocumentParser()
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();
@@ -225,7 +221,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());
@@ -350,7 +345,6 @@ void HTMLDocumentParser::startBackgroundParser()
void HTMLDocumentParser::stopBackgroundParser()
{
- ASSERT(shouldUseThreading());
ASSERT(m_haveBackgroundParser);
m_haveBackgroundParser = false;

Powered by Google App Engine
This is Rietveld 408576698