Oilpan: move ScriptLoader to the heap.

Source/core/dom/ScriptRunner.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 24 matching lines @@
 
 ScriptRunner::ScriptRunner(Document* document)
     : m_document(document)
     , m_timer(this, &ScriptRunner::timerFired)
 {
     ASSERT(document);
 }
 
 ScriptRunner::~ScriptRunner()
 {
+#if !ENABLE(OILPAN)
     // Make sure that ScriptLoaders don't keep their PendingScripts alive.
-    for (size_t i = 0; i < m_scriptsToExecuteInOrder.size(); ++i)
-        m_scriptsToExecuteInOrder[i]->detach();
-    for (size_t i = 0; i < m_scriptsToExecuteSoon.size(); ++i)
-        m_scriptsToExecuteSoon[i]->detach();
-    for (HashSet<ScriptLoader*>::iterator it = m_pendingAsyncScripts.begin(); it != m_pendingAsyncScripts.end(); ++it)
-        (*it)->detach();
+    for (ScriptLoader* scriptLoader : m_scriptsToExecuteInOrder)
+        scriptLoader->detach();
+    for (ScriptLoader* scriptLoader : m_scriptsToExecuteSoon)
+        scriptLoader->detach();
+    for (ScriptLoader* scriptLoader : m_pendingAsyncScripts)
+        scriptLoader->detach();
+#endif
 }
 
 void ScriptRunner::addPendingAsyncScript(ScriptLoader* scriptLoader)
 {
     m_document->incrementLoadEventDelayCount();
     m_pendingAsyncScripts.add(scriptLoader);
 }
 
 void ScriptRunner::queueScriptForExecution(ScriptLoader* scriptLoader, ExecutionType executionType)
 {
@@ skipping 62 matching lines @@
         m_document->decrementLoadEventDelayCount();
     }
 }
 
 void ScriptRunner::timerFired(Timer<ScriptRunner>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timer);
 
     RefPtrWillBeRawPtr<Document> protect(m_document.get());
 
-    Vector<ScriptLoader*> scriptLoaders;
+    WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > scriptLoaders;
     scriptLoaders.swap(m_scriptsToExecuteSoon);
 
     size_t numInOrderScriptsToExecute = 0;
     for (; numInOrderScriptsToExecute < m_scriptsToExecuteInOrder.size() && m_scriptsToExecuteInOrder[numInOrderScriptsToExecute]->isReady(); ++numInOrderScriptsToExecute)
         scriptLoaders.append(m_scriptsToExecuteInOrder[numInOrderScriptsToExecute]);
     if (numInOrderScriptsToExecute)
         m_scriptsToExecuteInOrder.remove(0, numInOrderScriptsToExecute);
 
     size_t size = scriptLoaders.size();
     for (size_t i = 0; i < size; ++i) {
         scriptLoaders[i]->execute();
         m_document->decrementLoadEventDelayCount();
     }
 }
 
 void ScriptRunner::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_scriptsToExecuteInOrder);
     visitor->trace(m_scriptsToExecuteSoon);
     visitor->trace(m_pendingAsyncScripts);
 #endif
 }
 
 }