Refactor HTMLTreeBuilder/HTMLConstructionSite ctor

third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  * Copyright (C) 2011, 2014 Apple 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
@@ skipping 249 matching lines @@
         if (start == m_current)
             return String();
         return String(m_characters->substring(start, m_current - start));
     }
 
     RefPtr<StringImpl> m_characters;
     unsigned m_current;
     unsigned m_end;
 };
 
-HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, HTMLDocument* document, ParserContentPolicy parserContentPolicy, const HTMLParserOptions& options)
+HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, Document& document, ParserContentPolicy parserContentPolicy, const HTMLParserOptions& options)
     : m_framesetOk(true)
 #if ENABLE(ASSERT)
     , m_isAttached(true)
 #endif
     , m_tree(document, parserContentPolicy)
     , m_insertionMode(InitialMode)
     , m_originalInsertionMode(InitialMode)
     , m_shouldSkipLeadingNewline(false)
     , m_parser(parser)
     , m_scriptToProcessStartPosition(uninitializedPositionValue1())
     , m_options(options)
 {
 }
 
-// FIXME: Member variables should be grouped into self-initializing structs to
-// minimize code duplication between these constructors.
 HTMLTreeBuilder::HTMLTreeBuilder(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy, const HTMLParserOptions& options)
-    : m_framesetOk(true)
-#if ENABLE(ASSERT)
-    , m_isAttached(true)
-#endif
-    , m_fragmentContext(fragment, contextElement)
-    , m_tree(fragment, parserContentPolicy)
-    , m_insertionMode(InitialMode)
-    , m_originalInsertionMode(InitialMode)
-    , m_shouldSkipLeadingNewline(false)
-    , m_parser(parser)
-    , m_scriptToProcessStartPosition(uninitializedPositionValue1())
-    , m_options(options)
+    : HTMLTreeBuilder(parser, fragment->document(), parserContentPolicy, options)
 {
     ASSERT(isMainThread());
     ASSERT(contextElement);
+    m_tree.initFragmentParsing(fragment);
+    m_fragmentContext.init(fragment, contextElement);
 
     // Steps 4.2-4.6 of the HTML5 Fragment Case parsing algorithm:
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-end.html#fragment-case
     // For efficiency, we skip step 4.2 ("Let root be a new html element with no attributes")
     // and instead use the DocumentFragment as a root node.
     m_tree.openElements()->pushRootNode(HTMLStackItem::create(fragment, HTMLStackItem::ItemForDocumentFragmentNode));
 
     if (isHTMLTemplateElement(*contextElement))
         m_templateInsertionModes.append(TemplateContentsMode);
 
     resetInsertionModeAppropriately();
     m_tree.setForm(closestFormAncestor(*contextElement));
 }
 
 HTMLTreeBuilder::~HTMLTreeBuilder()
 {
 }
 
+void HTMLTreeBuilder::FragmentParsingContext::init(DocumentFragment* fragment, Element* contextElement)
+{
+    DCHECK(fragment);
+    DCHECK(!fragment->hasChildren());
+    m_fragment = fragment;
+    m_contextElementStackItem = HTMLStackItem::create(contextElement, HTMLStackItem::ItemForContextElement);
+}
+
+DEFINE_TRACE(HTMLTreeBuilder::FragmentParsingContext)
+{
+    visitor->trace(m_fragment);
+    visitor->trace(m_contextElementStackItem);
+}
+
 DEFINE_TRACE(HTMLTreeBuilder)
 {
     visitor->trace(m_fragmentContext);
     visitor->trace(m_tree);
     visitor->trace(m_parser);
     visitor->trace(m_scriptToProcess);
 }
 
 void HTMLTreeBuilder::detach()
 {
 #if ENABLE(ASSERT)
     // This call makes little sense in fragment mode, but for consistency
     // DocumentParser expects detach() to always be called before it's destroyed.
     m_isAttached = false;
 #endif
     // HTMLConstructionSite might be on the callstack when detach() is called
     // otherwise we'd just call m_tree.clear() here instead.
     m_tree.detach();
 }
 
-HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext()
-    : m_fragment(nullptr)
-{
-}
-
-HTMLTreeBuilder::FragmentParsingContext::FragmentParsingContext(DocumentFragment* fragment, Element* contextElement)
-    : m_fragment(fragment)
-{
-    ASSERT(!fragment->hasChildren());
-    m_contextElementStackItem = HTMLStackItem::create(contextElement, HTMLStackItem::ItemForContextElement);
-}
-
-HTMLTreeBuilder::FragmentParsingContext::~FragmentParsingContext()
-{
-}
-
-DEFINE_TRACE(HTMLTreeBuilder::FragmentParsingContext)
-{
-    visitor->trace(m_fragment);
-    visitor->trace(m_contextElementStackItem);
-}
-
 Element* HTMLTreeBuilder::takeScriptToProcess(TextPosition& scriptStartPosition)
 {
     ASSERT(m_scriptToProcess);
     ASSERT(!m_tree.hasPendingTasks());
     // Unpause ourselves, callers may pause us again when processing the script.
     // The HTML5 spec is written as though scripts are executed inside the tree
     // builder.  We pause the parser to exit the tree builder, and then resume
     // before running scripts.
     scriptStartPosition = m_scriptToProcessStartPosition;
     m_scriptToProcessStartPosition = uninitializedPositionValue1();
@@ skipping 1755 matching lines @@
                 m_parser->tokenizer()->setState(HTMLTokenizer::DataState);
             }
             return;
         }
         m_tree.openElements()->pop();
         setInsertionMode(m_originalInsertionMode);
         break;
     case InFramesetMode:
         ASSERT(getInsertionMode() == InFramesetMode);
         if (token->name() == framesetTag) {
-            bool ignoreFramesetForFragmentParsing  = m_tree.currentIsRootNode();
+            bool ignoreFramesetForFragmentParsing = m_tree.currentIsRootNode();
             ignoreFramesetForFragmentParsing = ignoreFramesetForFragmentParsing || m_tree.openElements()->hasTemplateInHTMLScope();
             if (ignoreFramesetForFragmentParsing) {
                 ASSERT(isParsingFragmentOrTemplateContents());
                 parseError(token);
                 return;
             }
             m_tree.openElements()->pop();
             if (!isParsingFragment() && !m_tree.currentStackItem()->hasTagName(framesetTag))
                 setInsertionMode(AfterFramesetMode);
             return;
@@ skipping 671 matching lines @@
     ASSERT(m_isAttached);
     // Warning, this may detach the parser. Do not do anything else after this.
     m_tree.finishedParsing();
 }
 
 void HTMLTreeBuilder::parseError(AtomicHTMLToken*)
 {
 }
 
 } // namespace blink