Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/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 138 matching lines @@
 {
     // Verify that detach() has been called.
     ASSERT(!m_document);
 }
 
 void HTMLScriptRunner::detach()
 {
     if (!m_document)
         return;
 
-    m_parserBlockingScript->stopWatchingForLoad(this);
+    m_parserBlockingScript->stopWatchingForLoad();
     m_parserBlockingScript->releaseElementAndClear();
 
     while (!m_scriptsToExecuteAfterParsing.isEmpty()) {
         OwnPtrWillBeRawPtr<PendingScript> pendingScript = m_scriptsToExecuteAfterParsing.takeFirst();
-        pendingScript->stopWatchingForLoad(this);
+        pendingScript->stopWatchingForLoad();
         pendingScript->releaseElementAndClear();
     }
     m_document = nullptr;
 }
 
 bool HTMLScriptRunner::isPendingScriptReady(const PendingScript* script)
 {
     m_hasScriptsWaitingForResources = !m_document->isScriptExecutionReady();
     if (m_hasScriptsWaitingForResources)
         return false;
@@ skipping 11 matching lines @@
     executePendingScriptAndDispatchEvent(m_parserBlockingScript.get(), ScriptStreamer::ParsingBlocking);
 }
 
 void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript* pendingScript, ScriptStreamer::Type pendingScriptType)
 {
     bool errorOccurred = false;
     double loadFinishTime = pendingScript->resource() && pendingScript->resource()->url().protocolIsInHTTPFamily() ? pendingScript->resource()->loadFinishTime() : 0;
     ScriptSourceCode sourceCode = pendingScript->getSource(documentURLForScriptExecution(m_document), errorOccurred);
 
     // Stop watching loads before executeScript to prevent recursion if the script reloads itself.
-    pendingScript->stopWatchingForLoad(this);
+    pendingScript->stopWatchingForLoad();
 
     if (!isExecutingScript()) {
         Microtask::performCheckpoint(V8PerIsolateData::mainThreadIsolate());
         if (pendingScriptType == ScriptStreamer::ParsingBlocking) {
             m_hasScriptsWaitingForResources = !m_document->isScriptExecutionReady();
             // The parser cannot be unblocked as a microtask requested another resource
             if (m_hasScriptsWaitingForResources)
                 return;
         }
     }
@@ skipping 25 matching lines @@
         DEFINE_STATIC_LOCAL(CustomCountHistogram, loadAndCompileHistogram, ("WebCore.Scripts.ParsingBlocking.TimeBetweenLoadedAndCompiled", 0, 10000, 50));
         loadAndCompileHistogram.count(duration);
     }
 
     ASSERT(!isExecutingScript());
 }
 
 void HTMLScriptRunner::stopWatchingResourceForLoad(Resource* resource)
 {
     if (m_parserBlockingScript->resource() == resource) {
-        m_parserBlockingScript->stopWatchingForLoad(this);
+        m_parserBlockingScript->stopWatchingForLoad();
         m_parserBlockingScript->releaseElementAndClear();
         return;
     }
     for (auto& script : m_scriptsToExecuteAfterParsing) {
         if (script->resource() == resource) {
-            script->stopWatchingForLoad(this);
+            script->stopWatchingForLoad();
             script->releaseElementAndClear();
             return;
         }
     }
 }
 
 void HTMLScriptRunner::notifyFinished(Resource* cachedResource)
 {
     // Handle cancellations of parser-blocking script loads without
     // notifying the host (i.e., parser) if these were initiated by nested
@@ skipping 124 matching lines @@
 
     ASSERT(pendingScript->resource());
     m_scriptsToExecuteAfterParsing.append(pendingScript.release());
 }
 
 bool HTMLScriptRunner::requestPendingScript(PendingScript* pendingScript, Element* script) const
 {
     ASSERT(!pendingScript->element());
     pendingScript->setElement(script);
     // This should correctly return 0 for empty or invalid srcValues.
-    ScriptResource* resource = toScriptLoaderIfPossible(script)->resource().get();
+    ScriptResource* resource = toScriptLoaderIfPossible(script)->resource();
     if (!resource) {
         notImplemented(); // Dispatch error event.
         return false;
     }
     pendingScript->setScriptResource(resource);
     return true;
 }
 
 // Implements the initial steps for 'An end tag whose tag name is "script"'
 // http://whatwg.org/html#scriptEndTag
@@ skipping 43 matching lines @@
 
 DEFINE_TRACE(HTMLScriptRunner)
 {
     visitor->trace(m_document);
     visitor->trace(m_host);
     visitor->trace(m_parserBlockingScript);
     visitor->trace(m_scriptsToExecuteAfterParsing);
 }
 
 } // namespace blink