HTML parser: implementing throw-on-dynamic-markup-insertion counter

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

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  * Copyright (C) 2011 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 21 matching lines @@
 #include "core/HTMLNames.h"
 #include "core/dom/Comment.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/dom/DocumentType.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/IgnoreDestructiveWriteCountIncrementer.h"
 #include "core/dom/ScriptLoader.h"
 #include "core/dom/TemplateContentDocumentFragment.h"
 #include "core/dom/Text.h"
+#include "core/dom/ThrowOnDynamicMarkupInsertionCountIncrementer.h"
 #include "core/dom/custom/CEReactionsScope.h"
 #include "core/dom/custom/CustomElementDefinition.h"
 #include "core/dom/custom/CustomElementDescriptor.h"
 #include "core/dom/custom/CustomElementRegistry.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLHtmlElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLScriptElement.h"
@@ skipping 750 matching lines @@
     // "4. Let definition be the result of looking up a custom element ..." etc.
     CustomElementDefinition* definition = m_isParsingFragment ? nullptr : lookUpCustomElementDefinition(document, token);
     // "5. If definition is non-null and the parser was not originally created
     // for the HTML fragment parsing algorithm, then let will execute script
     // be true."
     bool willExecuteScript = definition && !m_isParsingFragment;
 
     HTMLElement* element;
 
     if (willExecuteScript) {
-        // "6.1 Increment the parser's script nesting level."
-        HTMLParserReentryPermit::ScriptNestingLevelIncrementer incrementScriptNestingLevel = m_reentryPermit->incrementScriptNestingLevel();
-
-        // "6.2 Set the parser pause flag to true."
-        m_reentryPermit->pause();
-
-        // TODO(dominicc): Change this once resolved:
-        // https://github.com/whatwg/html/issues/1630
-        IgnoreDestructiveWriteCountIncrementer ignoreDestructiveWrites(
+        // "6.1 Increment the document's throw-on-dynamic-insertion counter."
+        ThrowOnDynamicMarkupInsertionCountIncrementer throwOnDynamicMarkupInsertions(
             &document);
 
-        // "6.3 If the JavaScript execution context stack is empty,
+        // "6.2 If the JavaScript execution context stack is empty,
         // then perform a microtask checkpoint."
 
         // TODO(dominicc): This is the way the Blink HTML parser
         // performs checkpoints, but note the spec is different--it
         // talks about the JavaScript stack, not the script nesting
         // level.
-        if (1u == m_reentryPermit->scriptNestingLevel())
+        if (0u == m_reentryPermit->scriptNestingLevel())
             Microtask::performCheckpoint(V8PerIsolateData::mainThreadIsolate());
 
-        // "6.4 Push a new element queue onto the custom element
+        // "6.3 Push a new element queue onto the custom element
         // reactions stack."
         CEReactionsScope reactions;
 
         // 7.
         QualifiedName elementQName(nullAtom, token->name(), HTMLNames::xhtmlNamespaceURI);
         element = definition->createElementSync(document, elementQName);
 
         // "8. Append each attribute in the given token to element."
         // We don't use setAttributes here because the custom element
         // constructor may have manipulated attributes.
         for (const auto& attribute : token->attributes())
             element->setAttribute(attribute.name(), attribute.value());
 
         // "9. If will execute script is true, then ..." etc. The
-        // CEReactionsScope and ScriptNestingLevelIncrementer
-        // destructors implement steps 9.1-4.
+        // CEReactionsScope and ThrowOnDynamicMarkupInsertionCountIncrementer
+        // destructors implement steps 9.1-3.
     } else {
         // FIXME: This can't use
         // HTMLConstructionSite::createElement because we have to
         // pass the current form element. We should rework form
         // association to occur after construction to allow better
         // code sharing here.
         element = HTMLElementFactory::createHTMLElement(token->name(), document, form, getCreateElementFlags());
         // Definition for the created element does not exist here and
         // it cannot be custom or failed.
         DCHECK_NE(element->getCustomElementState(), CustomElementState::Custom);
@@ skipping 123 matching lines @@
     queueTask(task);
 }
 
 DEFINE_TRACE(HTMLConstructionSite::PendingText)
 {
     visitor->trace(parent);
     visitor->trace(nextChild);
 }
 
 } // namespace blink