Create PendingScriptClient as a separate client interface for PendingScript.

third_party/WebKit/Source/core/dom/ScriptLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 73 matching lines @@
     m_startLineNumber =
         element->document().scriptableDocumentParser()->lineNumber();
 }
 
 ScriptLoader::~ScriptLoader() {}
 
 DEFINE_TRACE(ScriptLoader) {
   visitor->trace(m_element);
   visitor->trace(m_resource);
   visitor->trace(m_pendingScript);
-  ScriptResourceClient::trace(visitor);
+  PendingScriptClient::trace(visitor);
 }
 
 void ScriptLoader::setFetchDocWrittenScriptDeferIdle() {
   DCHECK(!m_createdDuringDocumentWrite);
   m_documentWriteIntervention =
       DocumentWriteIntervention::FetchDocWrittenScriptDeferIdle;
 }
 
 void ScriptLoader::didNotifySubtreeInsertionsToDocument() {
   if (!m_parserInserted)
@@ skipping 179 matching lines @@
   } else if (!client->hasSourceAttribute() && m_parserInserted &&
              !elementDocument.isScriptExecutionReady()) {
     m_willBeParserExecuted = true;
     m_readyToBeParserExecuted = true;
   } else if (client->hasSourceAttribute() && !client->asyncAttributeValue() &&
              !m_forceAsync) {
     m_pendingScript = PendingScript::create(m_element, m_resource.get());
     m_asyncExecType = ScriptRunner::InOrder;
     contextDocument->scriptRunner()->queueScriptForExecution(this,
                                                              m_asyncExecType);
-    // Note that watchForLoad can immediately call notifyFinished.
+    // Note that watchForLoad can immediately call pendingScriptFinished.
     m_pendingScript->watchForLoad(this);
   } else if (client->hasSourceAttribute()) {
     m_pendingScript = PendingScript::create(m_element, m_resource.get());
     m_asyncExecType = ScriptRunner::Async;
     LocalFrame* frame = m_element->document().frame();
     if (frame) {
       ScriptState* scriptState = ScriptState::forMainWorld(frame);
       if (scriptState)
         ScriptStreamer::startStreaming(
             m_pendingScript.get(), ScriptStreamer::Async, frame->settings(),
             scriptState, frame->frameScheduler()->loadingTaskRunner());
     }
     contextDocument->scriptRunner()->queueScriptForExecution(this,
                                                              m_asyncExecType);
-    // Note that watchForLoad can immediately call notifyFinished.
+    // Note that watchForLoad can immediately call pendingScriptFinished.
     m_pendingScript->watchForLoad(this);
   } else {
     // Reset line numbering for nested writes.
     TextPosition position = elementDocument.isInDocumentWrite()
                                 ? TextPosition()
                                 : scriptStartPosition;
     KURL scriptURL = (!elementDocument.isInDocumentWrite() && m_parserInserted)
                          ? elementDocument.url()
                          : KURL();
     if (!executeScript(
@@ skipping 246 matching lines @@
     dispatchErrorEvent();
   } else if (!m_resource->wasCanceled()) {
     if (executeScript(source))
       dispatchLoadEvent();
     else
       dispatchErrorEvent();
   }
   m_resource = nullptr;
 }
 
-void ScriptLoader::notifyFinished(Resource* resource) {
+void ScriptLoader::pendingScriptFinished(PendingScript* pendingScript) {
   DCHECK(!m_willBeParserExecuted);
+  DCHECK_EQ(m_pendingScript, pendingScript);
 
   // We do not need this script in the memory cache. The primary goals of
   // sending this fetch request are to let the third party server know
   // about the document.write scripts intervention and populate the http
   // cache for subsequent uses.
   if (m_documentWriteIntervention ==
       DocumentWriteIntervention::FetchDocWrittenScriptDeferIdle) {
-    memoryCache()->remove(resource);
+    memoryCache()->remove(m_pendingScript->resource());
     m_pendingScript->stopWatchingForLoad();
     return;
   }
 
   DCHECK(m_asyncExecType != ScriptRunner::None);
 
   Document* contextDocument = m_element->document().contextDocument();
   if (!contextDocument) {
     detach();
     return;
   }
 
-  DCHECK_EQ(resource, m_resource);
+  DCHECK_EQ(pendingScript->resource(), m_resource);
 
   if (m_resource->errorOccurred()) {
     contextDocument->scriptRunner()->notifyScriptLoadError(this,
                                                            m_asyncExecType);
     detach();
     dispatchErrorEvent();
     return;
   }
   contextDocument->scriptRunner()->notifyScriptReady(this, m_asyncExecType);
   m_pendingScript->stopWatchingForLoad();
@@ skipping 37 matching lines @@
   if (isHTMLScriptLoader(element))
     return toHTMLScriptElement(element)->loader();
 
   if (isSVGScriptLoader(element))
     return toSVGScriptElement(element)->loader();
 
   return 0;
 }
 
 }  // namespace blink