Refactor PendingScript / HTMLScriptRunner.

Source/core/html/parser/HTMLScriptRunner.cpp

 /*
  * Copyright (C) 2010 Google, 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 54 matching lines @@
     // Verify that detach() has been called.
     ASSERT(!m_document);
 #endif
 }
 
 void HTMLScriptRunner::detach()
 {
     if (!m_document)
         return;
 
-    if (m_parserBlockingScript.resource() && m_parserBlockingScript.watchingForLoad())
-        stopWatchingForLoad(m_parserBlockingScript);
+    m_parserBlockingScript.stopWatchingForLoad(this);
 
     while (!m_scriptsToExecuteAfterParsing.isEmpty()) {
         PendingScript pendingScript = m_scriptsToExecuteAfterParsing.takeFirst();
-        if (pendingScript.resource() && pendingScript.watchingForLoad())
-            stopWatchingForLoad(pendingScript);
+        pendingScript.stopWatchingForLoad(this);
     }
     m_document = nullptr;
 }
 
 static KURL documentURLForScriptExecution(Document* document)
 {
     if (!document)
         return KURL();
 
     if (!document->frame()) {
         if (document->importsController())
             return document->url();
         return KURL();
     }
 
     // Use the URL of the currently active document for this frame.
     return document->frame()->document()->url();
 }
 
 inline PassRefPtrWillBeRawPtr<Event> createScriptLoadEvent()
 {
     return Event::create(EventTypeNames::load);
 }
 
-ScriptSourceCode HTMLScriptRunner::sourceFromPendingScript(const PendingScript& script, bool& errorOccurred) const
-{
-    if (script.resource()) {
-        errorOccurred = script.resource()->errorOccurred();
-        ASSERT(script.resource()->isLoaded());
-        return ScriptSourceCode(script.resource());
-    }
-    errorOccurred = false;
-    return ScriptSourceCode(script.element()->textContent(), documentURLForScriptExecution(m_document), script.startingPosition());
-}
-
 bool HTMLScriptRunner::isPendingScriptReady(const PendingScript& script)
 {
     m_hasScriptsWaitingForResources = !m_document->isScriptExecutionReady();
     if (m_hasScriptsWaitingForResources)
         return false;
     if (script.resource() && !script.resource()->isLoaded())
         return false;
     return true;
 }
 
 void HTMLScriptRunner::executeParsingBlockingScript()
 {
     ASSERT(m_document);
     ASSERT(!isExecutingScript());
     ASSERT(m_document->isScriptExecutionReady());
     ASSERT(isPendingScriptReady(m_parserBlockingScript));
 
     InsertionPointRecord insertionPointRecord(m_host->inputStream());
     executePendingScriptAndDispatchEvent(m_parserBlockingScript, PendingScriptBlockingParser);
 }
 
 void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendingScript, PendingScriptType pendingScriptType)
 {
     bool errorOccurred = false;
-    ScriptSourceCode sourceCode = sourceFromPendingScript(pendingScript, errorOccurred);
+    ScriptSourceCode sourceCode = pendingScript.getSource(documentURLForScriptExecution(m_document), errorOccurred);
 
     // Stop watching loads before executeScript to prevent recursion if the script reloads itself.
-    if (pendingScript.resource() && pendingScript.watchingForLoad())
-        stopWatchingForLoad(pendingScript);
+    pendingScript.stopWatchingForLoad(this);
 
     if (!isExecutingScript()) {
         Microtask::performCheckpoint();
         if (pendingScriptType == PendingScriptBlockingParser) {
             m_hasScriptsWaitingForResources = !m_document->isScriptExecutionReady();
             // The parser cannot be unblocked as a microtask requested another resource
             if (m_hasScriptsWaitingForResources)
                 return;
         }
     }
@@ skipping 13 matching lines @@
     }
     if (sourceCode.resource()) {
         double timeBetweenLoadedAndCompiledMs = (WTF::monotonicallyIncreasingTime() - sourceCode.resource()->loadFinishTime()) * 1000;
         const char* histogramName = pendingScriptType == PendingScriptBlockingParser ? "WebCore.Scripts.ParsingBlocking.TimeBetweenLoadedAndCompiled" : "WebCore.Scripts.Deferred.TimeBetweenLoadedAndCompiled";
         blink::Platform::current()->histogramCustomCounts(histogramName, timeBetweenLoadedAndCompiledMs, 0, 10000, 50);
     }
 
     ASSERT(!isExecutingScript());
 }
 
-void HTMLScriptRunner::watchForLoad(PendingScript& pendingScript)
-{
-    ASSERT(!pendingScript.watchingForLoad());
-    ASSERT(!pendingScript.resource()->isLoaded());
-    // addClient() will call notifyFinished() if the load is complete.
-    // Callers do not expect to be re-entered from this call, so they
-    // should not become a client of an already-loaded Resource.
-    pendingScript.resource()->addClient(this);
-    pendingScript.setWatchingForLoad(true);
-}
-
-void HTMLScriptRunner::stopWatchingForLoad(PendingScript& pendingScript)
-{
-    ASSERT(pendingScript.watchingForLoad());
-    pendingScript.resource()->removeClient(this);
-    pendingScript.setWatchingForLoad(false);
-}
-
 void HTMLScriptRunner::notifyFinished(Resource* cachedResource)
 {
     m_host->notifyScriptLoaded(cachedResource);
 }
 
 // Implements the steps for 'An end tag whose tag name is "script"'
 // http://whatwg.org/html#scriptEndTag
 // Script handling lives outside the tree builder to keep each class simple.
 void HTMLScriptRunner::execute(PassRefPtrWillBeRawPtr<Element> scriptElement, const TextPosition& scriptStartPosition)
 {
@@ skipping 46 matching lines @@
     executeParsingBlockingScripts();
 }
 
 bool HTMLScriptRunner::executeScriptsWaitingForParsing()
 {
     while (!m_scriptsToExecuteAfterParsing.isEmpty()) {
         ASSERT(!isExecutingScript());
         ASSERT(!hasParserBlockingScript());
         ASSERT(m_scriptsToExecuteAfterParsing.first().resource());
         if (!m_scriptsToExecuteAfterParsing.first().resource()->isLoaded()) {
-            watchForLoad(m_scriptsToExecuteAfterParsing.first());
+            m_scriptsToExecuteAfterParsing.first().watchForLoad(this);
             return false;
         }
         PendingScript first = m_scriptsToExecuteAfterParsing.takeFirst();
         executePendingScriptAndDispatchEvent(first, PendingScriptDeferred);
         // FIXME: What is this m_document check for?
         if (!m_document)
             return false;
     }
     return true;
 }
 
 void HTMLScriptRunner::requestParsingBlockingScript(Element* element)
 {
     if (!requestPendingScript(m_parserBlockingScript, element))
         return;
 
     ASSERT(m_parserBlockingScript.resource());
 
     blink::Platform::current()->histogramEnumeration("WebCore.Scripts.ParsingBlocking.AlreadyLoaded", m_parserBlockingScript.resource()->isLoaded() ? 1 : 0, 2);
     // We only care about a load callback if resource is not already
     // in the cache. Callers will attempt to run the m_parserBlockingScript
     // if possible before returning control to the parser.
     if (!m_parserBlockingScript.resource()->isLoaded())
-        watchForLoad(m_parserBlockingScript);
+        m_parserBlockingScript.watchForLoad(this);
 }
 
 void HTMLScriptRunner::requestDeferredScript(Element* element)
 {
     PendingScript pendingScript;
     if (!requestPendingScript(pendingScript, element))
         return;
 
     ASSERT(pendingScript.resource());
     m_scriptsToExecuteAfterParsing.append(pendingScript);
@@ skipping 61 matching lines @@
 
 void HTMLScriptRunner::trace(Visitor* visitor)
 {
     visitor->trace(m_document);
     visitor->trace(m_host);
     visitor->trace(m_parserBlockingScript);
     visitor->trace(m_scriptsToExecuteAfterParsing);
 }
 
 }