Improve CancellableTaskFactory handling and Oilpan usage.

Source/core/dom/ScriptRunner.h

 /*
  * 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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ScriptRunner_h
 #define ScriptRunner_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/ResourcePtr.h"
 #include "platform/heap/Handle.h"
-#include "platform/scheduler/CancellableTaskFactory.h"
 #include "wtf/Deque.h"
 #include "wtf/HashMap.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
+class CancellableTaskFactory;
 class Document;
 class ScriptLoader;
 
 class CORE_EXPORT ScriptRunner final : public NoBaseWillBeGarbageCollectedFinalized<ScriptRunner> {
     WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ScriptRunner);
 public:
     static PassOwnPtrWillBeRawPtr<ScriptRunner> create(Document* document)
     {
         return adoptPtrWillBeNoop(new ScriptRunner(document));
     }
@@ skipping 22 matching lines @@
 
     bool yieldForHighPriorityWork();
 
     void postTaskIfOneIsNotAlreadyInFlight();
 
     RawPtrWillBeMember<Document> m_document;
     WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteInOrder;
     // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
     WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteSoon;
     WillBeHeapHashSet<RawPtrWillBeMember<ScriptLoader>> m_pendingAsyncScripts;
-    CancellableTaskFactory m_executeScriptsTaskFactory;
+    OwnPtr<CancellableTaskFactory> m_executeScriptsTaskFactory;
 };
 
 }
 
 #endif