De-Element ScriptLoader

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 19 matching lines @@
 #include "bindings/core/v8/Microtask.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/HTMLElementFactory.h"
 #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/frame/LocalFrameClient.h"
@@ skipping 229 matching lines @@
 void HTMLConstructionSite::queueTask(const HTMLConstructionSiteTask& task) {
   flushPendingText(FlushAlways);
   ASSERT(m_pendingText.isEmpty());
   m_taskQueue.push_back(task);
 }
 
 void HTMLConstructionSite::attachLater(ContainerNode* parent,
                                        Node* child,
                                        bool selfClosing) {
   ASSERT(scriptingContentIsAllowed(m_parserContentPolicy) ||
-         !child->isElementNode() ||
-         !toScriptLoaderIfPossible(toElement(child)));
+         !child->isElementNode() || !toElement(child)->isScriptElement());
   ASSERT(pluginContentIsAllowed(m_parserContentPolicy) ||
          !isHTMLPlugInElement(child));
 
   HTMLConstructionSiteTask task(HTMLConstructionSiteTask::Insert);
   task.parent = parent;
   task.child = child;
   task.selfClosing = selfClosing;
 
   if (shouldFosterParent()) {
     fosterParent(task.child);
@@ skipping 449 matching lines @@
 
 void HTMLConstructionSite::insertForeignElement(
     AtomicHTMLToken* token,
     const AtomicString& namespaceURI) {
   ASSERT(token->type() == HTMLToken::StartTag);
   // parseError when xmlns or xmlns:xlink are wrong.
   DVLOG(1) << "Not implemented.";
 
   Element* element = createElement(token, namespaceURI);
   if (scriptingContentIsAllowed(m_parserContentPolicy) ||
-      !toScriptLoaderIfPossible(element))
+      !element->isScriptElement()) {
     attachLater(currentNode(), element, token->selfClosing());
+  }
   if (!token->selfClosing())
     m_openElements.push(HTMLStackItem::create(element, token, namespaceURI));
 }
 
 void HTMLConstructionSite::insertTextNode(const StringView& string,
                                           WhitespaceMode whitespaceMode) {
   HTMLConstructionSiteTask dummyTask(HTMLConstructionSiteTask::Insert);
   dummyTask.parent = currentNode();
 
   if (shouldFosterParent())
@@ skipping 301 matching lines @@
   ASSERT(task.parent);
   queueTask(task);
 }
 
 DEFINE_TRACE(HTMLConstructionSite::PendingText) {
   visitor->trace(parent);
   visitor->trace(nextChild);
 }
 
 }  // namespace blink