Remove HTMLParserOptions

sky/engine/core/html/parser/HTMLDocumentParser.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 28 matching lines @@
 #include "core/html/parser/HTMLParserThread.h"
 #include "core/html/parser/HTMLTreeBuilder.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "platform/SharedBuffer.h"
 #include "platform/TraceEvent.h"
 #include "wtf/Functional.h"
 
 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)
     , m_endWasDelayed(false)
     , m_haveBackgroundParser(false)
     , m_pumpSessionNestingLevel(0)
 {
-    ASSERT(shouldUseThreading());
 }
 
 HTMLDocumentParser::~HTMLDocumentParser()
 {
 #if ENABLE(OILPAN)
     if (m_haveBackgroundParser)
         stopBackgroundParser();
     // In Oilpan, HTMLDocumentParser can die together with Document, and
     // detach() is not called in this case.
 #else
     ASSERT(!m_parserScheduler);
     ASSERT(!m_pumpSessionNestingLevel);
     ASSERT(!m_haveBackgroundParser);
     // FIXME: We should be able to ASSERT(m_speculations.isEmpty()),
     // but there are cases where that's not true currently. For example,
     // we we're told to stop parsing before we've consumed all the input.
 #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();
 
     m_backgroundParser = BackgroundHTMLParser::create(config.release());
     HTMLParserThread::taskRunner()->PostTask(FROM_HERE,
         base::Bind(&BackgroundHTMLParser::start, m_backgroundParser));
 }
 
 void HTMLDocumentParser::detach()
 {
@@ skipping 120 matching lines @@
     TRACE_EVENT0("blink", "HTMLDocumentParser::processParsedChunkFromBackgroundParser");
 
     ASSERT_WITH_SECURITY_IMPLICATION(!document()->activeParserCount());
     ASSERT(!isParsingFragment());
     ASSERT(!isWaitingForScripts());
     ASSERT(!isStopped());
 #if !ENABLE(OILPAN)
     // ASSERT that this object is both attached to the Document and protected.
     ASSERT(refCount() >= 2);
 #endif
-    ASSERT(shouldUseThreading());
     ASSERT(!m_lastChunkBeforeScript);
 
     ActiveParserSession session(contextForParsingSession());
 
     OwnPtr<ParsedChunk> chunk(popChunk);
     OwnPtr<CompactHTMLTokenStream> tokens = chunk->tokens.release();
 
     for (Vector<CompactHTMLToken>::const_iterator it = tokens->begin(); it != tokens->end(); ++it) {
         ASSERT(!isWaitingForScripts());
 
@@ skipping 104 matching lines @@
 {
     return false;
 }
 
 void HTMLDocumentParser::startBackgroundParser()
 {
 }
 
 void HTMLDocumentParser::stopBackgroundParser()
 {
-    ASSERT(shouldUseThreading());
     ASSERT(m_haveBackgroundParser);
     m_haveBackgroundParser = false;
 
     HTMLParserThread::taskRunner()->PostTask(FROM_HERE,
         base::Bind(&BackgroundHTMLParser::stop, m_backgroundParser));
     m_weakFactory.revokeAll();
 }
 
 void HTMLDocumentParser::end()
 {
@@ skipping 69 matching lines @@
 {
     if (!m_scriptRunner.hasPendingScripts())
         return;
     RefPtrWillBeRawPtr<HTMLDocumentParser> protect(this);
     m_scriptRunner.executePendingScripts();
     if (!isWaitingForScripts())
         resumeParsingAfterScriptExecution();
 }
 
 }