Improve CancellableTaskFactory handling and Oilpan usage.

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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/ScriptRunner.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/ScriptLoader.h"
 #include "platform/heap/Handle.h"
+#include "platform/scheduler/CancellableTaskFactory.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
-#include "wtf/Functional.h"
-
-// This bit of magic is needed by oilpan to prevent the ScriptRunner from leaking.
-namespace WTF {
-template<>
-struct ParamStorageTraits<blink::ScriptRunner*> : public PointerParamStorageTraits<blink::ScriptRunner*, false> {
-};
-}
 
 namespace blink {
 
 
 ScriptRunner::ScriptRunner(Document* document)
     : m_document(document)
-    , m_executeScriptsTaskFactory(WTF::bind(&ScriptRunner::executeScripts, this))
+    , m_executeScriptsTaskFactory(CancellableTaskFactory::create(this, &ScriptRunner::executeScripts))
 {
     ASSERT(document);
-#if ENABLE(LAZY_SWEEPING) && defined(ADDRESS_SANITIZER)
-    m_executeScriptsTaskFactory.setUnpoisonBeforeUpdate();
-#endif
 }
 
 ScriptRunner::~ScriptRunner()
 {
 #if !ENABLE(OILPAN)
     // Make sure that ScriptLoaders don't keep their PendingScripts alive.
     for (ScriptLoader* scriptLoader : m_scriptsToExecuteInOrder)
         scriptLoader->detach();
     for (ScriptLoader* scriptLoader : m_scriptsToExecuteSoon)
         scriptLoader->detach();
@@ skipping 19 matching lines @@
 
     case IN_ORDER_EXECUTION:
         m_document->incrementLoadEventDelayCount();
         m_scriptsToExecuteInOrder.append(scriptLoader);
         break;
     }
 }
 
 void ScriptRunner::suspend()
 {
-    m_executeScriptsTaskFactory.cancel();
+    m_executeScriptsTaskFactory->cancel();
 }
 
 void ScriptRunner::resume()
 {
     if (hasPendingScripts())
         postTaskIfOneIsNotAlreadyInFlight();
 }
 
 void ScriptRunner::notifyScriptReady(ScriptLoader* scriptLoader, ExecutionType executionType)
 {
@@ skipping 111 matching lines @@
 {
     if (!Platform::current()->currentThread()->scheduler()->shouldYieldForHighPriorityWork())
         return false;
 
     postTaskIfOneIsNotAlreadyInFlight();
     return true;
 }
 
 void ScriptRunner::postTaskIfOneIsNotAlreadyInFlight()
 {
-    if (m_executeScriptsTaskFactory.isPending())
+    if (m_executeScriptsTaskFactory->isPending())
         return;
 
-    Platform::current()->currentThread()->scheduler()->loadingTaskRunner()->postTask(FROM_HERE, m_executeScriptsTaskFactory.cancelAndCreate());
+    Platform::current()->currentThread()->scheduler()->loadingTaskRunner()->postTask(FROM_HERE, m_executeScriptsTaskFactory->cancelAndCreate());
 }
 
 DEFINE_TRACE(ScriptRunner)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_scriptsToExecuteInOrder);
     visitor->trace(m_scriptsToExecuteSoon);
     visitor->trace(m_pendingAsyncScripts);
 #endif
 }
 
-}
+} // namespace blink