Move token gathering into parser

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 1977 matching lines @@
         ASSERT(getInsertionMode() == InHeadMode);
         // FIXME: This case should be broken out into processEndTagForInHead,
         // because other end tag cases now refer to it ("process the token for using the rules of the "in head" insertion mode").
         // but because the logic falls through to AfterHeadMode, that gets a little messy.
         if (token->name() == templateTag) {
             processTemplateEndTag(token);
             return;
         }
         if (token->name() == headTag) {
             m_tree.openElements()->popHTMLHeadElement();
+            // Ensure list of experiments is finalized
+            m_tree.finalizeExperiments();
             setInsertionMode(AfterHeadMode);
             return;
         }
         if (token->name() != bodyTag && token->name() != htmlTag && token->name() != brTag) {
             parseError(token);
             return;
         }
         defaultForInHead();
         // Fall through.
     case AfterHeadMode:
@@ skipping 634 matching lines @@
     m_tree.insertHTMLElement(token);
     if (m_parser->tokenizer())
         m_parser->tokenizer()->setState(HTMLTokenizer::RAWTEXTState);
     m_originalInsertionMode = m_insertionMode;
     setInsertionMode(TextMode);
 }
 
 void HTMLTreeBuilder::processScriptStartTag(AtomicHTMLToken* token)
 {
     ASSERT(token->type() == HTMLToken::StartTag);
+    // Ensure that the list of experiments is finalized here
+    m_tree.finalizeExperiments();
     m_tree.insertScriptElement(token);
     if (m_parser->tokenizer())
         m_parser->tokenizer()->setState(HTMLTokenizer::ScriptDataState);
     m_originalInsertionMode = m_insertionMode;
 
     TextPosition position = m_parser->textPosition();
 
     m_scriptToProcessStartPosition = position;
 
     setInsertionMode(TextMode);
@@ skipping 157 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