Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

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
  * License as published by the Free Software Foundation; either
@@ skipping 41 matching lines @@
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebFrameScheduler.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 ScriptLoader::ScriptLoader(Element* element, bool parserInserted, bool alreadyStarted)
     : m_element(element)
-    , m_resource(0)
     , m_startLineNumber(WTF::OrdinalNumber::beforeFirst())
     , m_parserInserted(parserInserted)
     , m_isExternalScript(false)
     , m_alreadyStarted(alreadyStarted)
     , m_haveFiredLoad(false)
     , m_willBeParserExecuted(false)
     , m_readyToBeParserExecuted(false)
     , m_willExecuteInOrder(false)
     , m_willExecuteWhenDocumentFinishedParsing(false)
     , m_forceAsync(!parserInserted)
 {
     ASSERT(m_element);
     if (parserInserted && element->document().scriptableDocumentParser() && !element->document().isInDocumentWrite())
         m_startLineNumber = element->document().scriptableDocumentParser()->lineNumber();
-#if ENABLE(OILPAN)
-    ThreadState::current()->registerPreFinalizer(this);
-#endif
 }
 
 ScriptLoader::~ScriptLoader()
 {
-#if !ENABLE(OILPAN)
-    detach();
-#endif
 }
 
 DEFINE_TRACE(ScriptLoader)
 {
     visitor->trace(m_element);
+    visitor->trace(m_resource);
     visitor->trace(m_pendingScript);
 }
 
 void ScriptLoader::didNotifySubtreeInsertionsToDocument()
 {
     if (!m_parserInserted)
         prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
 void ScriptLoader::childrenChanged()
@@ skipping 12 matching lines @@
 
 void ScriptLoader::handleAsyncAttribute()
 {
     m_forceAsync = false;
 }
 
 void ScriptLoader::detach()
 {
     if (!m_pendingScript)
         return;
-    m_pendingScript->stopWatchingForLoad(this);
-    m_pendingScript->releaseElementAndClear();
+    m_pendingScript->dispose();
     m_pendingScript = nullptr;
 }
 
 // Helper function
 static bool isLegacySupportedJavaScriptLanguage(const String& language)
 {
     // Mozilla 1.8 accepts javascript1.0 - javascript1.7, but WinIE 7 accepts only javascript1.1 - javascript1.3.
     // Mozilla 1.8 and WinIE 7 both accept javascript and livescript.
     // WinIE 7 accepts ecmascript and jscript, but Mozilla 1.8 doesn't.
     // Neither Mozilla 1.8 nor WinIE 7 accept leading or trailing whitespace.
@@ skipping 311 matching lines @@
     RefPtrWillBeRawPtr<Element> element = m_pendingScript->releaseElementAndClear();
     ALLOW_UNUSED_LOCAL(element);
     if (errorOccurred) {
         dispatchErrorEvent();
     } else if (!m_resource->wasCanceled()) {
         if (executeScript(source))
             dispatchLoadEvent();
         else
             dispatchErrorEvent();
     }
-    m_resource = 0;
+    m_resource = nullptr;
 }
 
 void ScriptLoader::notifyFinished(Resource* resource)
 {
     ASSERT(!m_willBeParserExecuted);
 
     RefPtrWillBeRawPtr<Document> elementDocument(m_element->document());
     RefPtrWillBeRawPtr<Document> contextDocument = elementDocument->contextDocument().get();
     if (!contextDocument)
         return;
 
     ASSERT_UNUSED(resource, resource == m_resource);
 
     ScriptRunner::ExecutionType runOrder = m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION;
     if (m_resource->errorOccurred()) {
         dispatchErrorEvent();
         // The error handler can move the HTMLScriptElement to a new document.
         // In that case, we must notify the ScriptRunner of the new document,
         // not the ScriptRunner of the old docuemnt.
         contextDocument = m_element->document().contextDocument().get();
         if (!contextDocument)
             return;
         contextDocument->scriptRunner()->notifyScriptLoadError(this, runOrder);
         return;
     }
     contextDocument->scriptRunner()->notifyScriptReady(this, runOrder);
-    m_pendingScript->stopWatchingForLoad(this);
+    m_pendingScript->stopWatchingForLoad();
 }
 
 bool ScriptLoader::ignoresLoadRequest() const
 {
     return m_alreadyStarted || m_isExternalScript || m_parserInserted || !element() || !element()->inDocument();
 }
 
 bool ScriptLoader::isScriptForEventSupported() const
 {
     String eventAttribute = client()->eventAttributeValue();
@@ skipping 30 matching lines @@
     if (isHTMLScriptLoader(element))
         return toHTMLScriptElement(element)->loader();
 
     if (isSVGScriptLoader(element))
         return toSVGScriptElement(element)->loader();
 
     return 0;
 }
 
 } // namespace blink