De-Element ScriptLoader

third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2005, 2006, 2008, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 430 matching lines @@
   bool wasCanceled = m_pendingScript->wasCanceled();
   double scriptParserBlockingTime = m_parserBlockingPendingScriptLoadStartTime;
   m_parserBlockingPendingScriptLoadStartTime = 0.0;
 
   m_pendingScript->removeClient(this);
   m_pendingScript = nullptr;
 
   Element* e = m_scriptElement;
   m_scriptElement = nullptr;
 
-  ScriptLoader* scriptLoader = toScriptLoaderIfPossible(e);
+  ScriptLoader* scriptLoader =
+      ScriptLoaderClient::fromElementIfPossible(e)->loader();
   DCHECK(scriptLoader);
 
   if (errorOccurred) {
     scriptLoader->dispatchErrorEvent();
   } else if (!wasCanceled) {
     if (scriptParserBlockingTime > 0.0) {
       DocumentParserTiming::from(*document())
           .recordParserBlockedOnScriptLoadDuration(
               monotonicallyIncreasingTime() - scriptParserBlockingTime,
               scriptLoader->wasCreatedDuringDocumentWrite());
@@ skipping 560 matching lines @@
   handleElementAttributes(prefixedAttributes, libxmlAttributes, nbAttributes,
                           m_prefixToNamespaceMap, exceptionState);
   setAttributes(newElement, prefixedAttributes, getParserContentPolicy());
   if (exceptionState.hadException()) {
     stopParsing();
     return;
   }
 
   newElement->beginParsingChildren();
 
-  ScriptLoader* scriptLoader = toScriptLoaderIfPossible(newElement);
-  if (scriptLoader)
+  if (ScriptLoaderClient::fromElementIfPossible(newElement))

[hiroshige, 2017/03/01 00:58:15]

Same as HTMLOptionElement.cpp.

[Nate Chapin, 2017/03/01 21:35:00]

Done.

     m_scriptStartPosition = textPosition();
 
   m_currentNode->parserAppendChild(newElement);
 
   // Event handlers may synchronously trigger removal of the
   // document and cancellation of this parser.
   if (isStopped()) {
     stopParsing();
     return;
   }
@@ skipping 24 matching lines @@
     return;
   }
 
   if (!updateLeafTextNode())
     return;
 
   ContainerNode* n = m_currentNode;
   if (m_currentNode->isElementNode())
     toElement(n)->finishParsingChildren();
 
+  ScriptLoaderClient* scriptLoaderClient =
+      n->isElementNode()
+          ? ScriptLoaderClient::fromElementIfPossible(toElement(n))
+          : nullptr;
   if (!scriptingContentIsAllowed(getParserContentPolicy()) &&
-      n->isElementNode() && toScriptLoaderIfPossible(toElement(n))) {
+      scriptLoaderClient) {
     popCurrentNode();
     n->remove(IGNORE_EXCEPTION_FOR_TESTING);
     return;
   }
 
   if (!n->isElementNode() || !m_hasView) {
     popCurrentNode();
     return;
   }
 
   Element* element = toElement(n);
 
   // The element's parent may have already been removed from document.
   // Parsing continues in this case, but scripts aren't executed.
   if (!element->isConnected()) {
     popCurrentNode();
     return;
   }
 
-  ScriptLoader* scriptLoader = toScriptLoaderIfPossible(element);
+  ScriptLoader* scriptLoader =
+      scriptLoaderClient ? scriptLoaderClient->loader() : nullptr;
   if (!scriptLoader) {
     popCurrentNode();
     return;
   }
 
   // Don't load external scripts for standalone documents (for now).
   DCHECK(!m_pendingScript);
   m_requestingScript = true;
 
   if (scriptLoader->prepareScript(
@@ skipping 599 matching lines @@
   RefPtr<XMLParserContext> parser =
       XMLParserContext::createStringParser(&sax, &state);
   String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />";
   parseChunk(parser->context(), parseString);
   finishParsing(parser->context());
   attrsOK = state.gotAttributes;
   return state.attributes;
 }
 
 }  // namespace blink