Create PendingScriptClient as a separate client interface for PendingScript.

third_party/WebKit/Source/core/dom/PendingScript.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 48 matching lines @@
   setScriptResource(nullptr);
   m_startingPosition = TextPosition::belowRangePosition();
   m_integrityFailure = false;
   m_parserBlockingLoadStartTime = 0;
   if (m_streamer)
     m_streamer->cancel();
   m_streamer = nullptr;
   m_element = nullptr;
 }
 
-void PendingScript::watchForLoad(ScriptResourceClient* client) {
+void PendingScript::watchForLoad(PendingScriptClient* client) {
   DCHECK(!m_watchingForLoad);
   // addClient() will call streamingFinished() if the load is complete. Callers
   // who do not expect to be re-entered from this call should not call
   // watchForLoad for a PendingScript which isReady. We also need to set
   // m_watchingForLoad early, since addClient() can result in calling
   // notifyFinished and further stopWatchingForLoad().
   m_watchingForLoad = true;
   m_client = client;
-  if (!m_streamer)
-    resource()->addClient(client);
+  if (isReady())
+    m_client->pendingScriptFinished(this);
 }
 
 void PendingScript::stopWatchingForLoad() {
   if (!m_watchingForLoad)
     return;
   DCHECK(resource());
-  if (!m_streamer)
-    resource()->removeClient(m_client);
   m_client = nullptr;
   m_watchingForLoad = false;
 }
 
 void PendingScript::streamingFinished() {
   DCHECK(resource());
   if (m_client)
-    m_client->notifyFinished(resource());
+    m_client->pendingScriptFinished(this);

[kouhei (in TOK), 2016/12/12 01:37:05]

Wow. Thanks for this change. Old code abusing ScriptResourceClient interface
looks very scary.

 }
 
 void PendingScript::setElement(Element* element) {
   m_element = element;
 }
 
 void PendingScript::setScriptResource(ScriptResource* resource) {
   setResource(resource);
 }
 
@@ skipping 51 matching lines @@
             scriptResource->integrityMetadata(), *m_element,
             resource->resourceBuffer()->data(),
             resource->resourceBuffer()->size(), resource->url(), *resource);
         scriptResource->setIntegrityDisposition(
             m_integrityFailure ? ResourceIntegrityDisposition::Failed
                                : ResourceIntegrityDisposition::Passed);
       }
     }
   }
 
+  // If script streaming is in use, the client will be notified in
+  // streamingFinished.
   if (m_streamer)
     m_streamer->notifyFinished(resource);
+  else if (m_client)
+    m_client->pendingScriptFinished(this);
 }
 
 void PendingScript::notifyAppendData(ScriptResource* resource) {
   if (m_streamer)
     m_streamer->notifyAppendData(resource);
 }
 
 DEFINE_TRACE(PendingScript) {
   visitor->trace(m_element);
   visitor->trace(m_streamer);
@@ skipping 41 matching lines @@
 void PendingScript::onMemoryStateChange(MemoryState state) {
   if (state != MemoryState::SUSPENDED)
     return;
   if (!m_streamer)
     return;
   m_streamer->cancel();
   m_streamer = nullptr;
 }
 
 }  // namespace blink