Move ResourceOwner on to the oilpan heap.

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 60 matching lines @@
     , m_forceAsync(!parserInserted)
     , m_willExecuteInOrder(false)
 {
     ASSERT(m_element);
     if (parserInserted && element->document().scriptableDocumentParser() && !element->document().isInDocumentWrite())
         m_startLineNumber = element->document().scriptableDocumentParser()->lineNumber();
 }
 
 ScriptLoader::~ScriptLoader()
 {
-    m_pendingScript.stopWatchingForLoad(this);
+#if !ENABLE(OILPAN)
+    dispose();

[haraken, 2016/01/12 00:22:52]

I think it's better to call detach() (i.e., it's no harm to call
m_pendingScript->releaseElementAndClear()). A pre-finalizer can call detach() as
well. Then we can remove dispose().

[Nate Chapin, 2016/01/13 20:36:33]

Done.

+#endif
+}
+
+void ScriptLoader::dispose()
+{
+    if (m_pendingScript) {
+        m_pendingScript->stopWatchingForLoad(this);
+        m_pendingScript = nullptr;
+    }
 }
 
 DEFINE_TRACE(ScriptLoader)
 {
     visitor->trace(m_element);
     visitor->trace(m_pendingScript);
 }
 
 void ScriptLoader::didNotifySubtreeInsertionsToDocument()
 {
@@ skipping 15 matching lines @@
     prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
 void ScriptLoader::handleAsyncAttribute()
 {
     m_forceAsync = false;
 }
 
 void ScriptLoader::detach()
 {
-    m_pendingScript.stopWatchingForLoad(this);
-    m_pendingScript.releaseElementAndClear();
+    if (!m_pendingScript)
+        return;
+    m_pendingScript->stopWatchingForLoad(this);
+    m_pendingScript->releaseElementAndClear();
+    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.
     // We want to accept all the values that either of these browsers accept, but not other values.
@@ skipping 114 matching lines @@
     if (client->hasSourceAttribute() && client->deferAttributeValue() && m_parserInserted && !client->asyncAttributeValue()) {
         m_willExecuteWhenDocumentFinishedParsing = true;
         m_willBeParserExecuted = true;
     } else if (client->hasSourceAttribute() && m_parserInserted && !client->asyncAttributeValue()) {
         m_willBeParserExecuted = true;
     } else if (!client->hasSourceAttribute() && m_parserInserted && !elementDocument.isRenderingReady()) {
         m_willBeParserExecuted = true;
         m_readyToBeParserExecuted = true;
     } else if (client->hasSourceAttribute() && !client->asyncAttributeValue() && !m_forceAsync) {
         m_willExecuteInOrder = true;
-        m_pendingScript = PendingScript(m_element, m_resource.get());
+        m_pendingScript = PendingScript::create(m_element, m_resource.get());
         contextDocument->scriptRunner()->queueScriptForExecution(this, ScriptRunner::IN_ORDER_EXECUTION);
         // Note that watchForLoad can immediately call notifyFinished.
-        m_pendingScript.watchForLoad(this);
+        m_pendingScript->watchForLoad(this);
     } else if (client->hasSourceAttribute()) {
-        m_pendingScript = PendingScript(m_element, m_resource.get());
+        m_pendingScript = PendingScript::create(m_element, m_resource.get());
         LocalFrame* frame = m_element->document().frame();
         if (frame) {
             ScriptState* scriptState = ScriptState::forMainWorld(frame);
             if (scriptState)
-                ScriptStreamer::startStreaming(m_pendingScript, PendingScript::Async, frame->settings(), scriptState, frame->frameScheduler()->loadingTaskRunner());
+                ScriptStreamer::startStreaming(m_pendingScript.get(), PendingScript::Async, frame->settings(), scriptState, frame->frameScheduler()->loadingTaskRunner());
         }
         contextDocument->scriptRunner()->queueScriptForExecution(this, ScriptRunner::ASYNC_EXECUTION);
         // Note that watchForLoad can immediately call notifyFinished.
-        m_pendingScript.watchForLoad(this);
+        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(ScriptSourceCode(scriptContent(), scriptURL, position))) {
             dispatchErrorEvent();
             return false;
         }
     }
 
@@ skipping 144 matching lines @@
         ASSERT(contextDocument->currentScript() == m_element);
         contextDocument->popCurrentScript();
     }
 
     return true;
 }
 
 void ScriptLoader::execute()
 {
     ASSERT(!m_willBeParserExecuted);
-    ASSERT(m_pendingScript.resource());
+    ASSERT(m_pendingScript->resource());
     bool errorOccurred = false;
-    ScriptSourceCode source = m_pendingScript.getSource(KURL(), errorOccurred);
-    RefPtrWillBeRawPtr<Element> element = m_pendingScript.releaseElementAndClear();
+    ScriptSourceCode source = m_pendingScript->getSource(KURL(), errorOccurred);
+    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;
@@ skipping 16 matching lines @@
         // dispatchErrorEvent might 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(this);
 }
 
 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