| Index: Source/core/dom/ScriptRunner.h
|
| diff --git a/Source/core/dom/ScriptRunner.h b/Source/core/dom/ScriptRunner.h
|
| index 7f0cfbe5a237cc370cd4494b19aeb27ddb7dd7e3..244b7991e16a22e7da9dfa58a70f786fc00475ac 100644
|
| --- a/Source/core/dom/ScriptRunner.h
|
| +++ b/Source/core/dom/ScriptRunner.h
|
| @@ -27,12 +27,12 @@
|
| #define ScriptRunner_h
|
|
|
| #include "core/fetch/ResourcePtr.h"
|
| -#include "platform/Timer.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"
|
| -#include "wtf/Vector.h"
|
|
|
| namespace blink {
|
|
|
| @@ -63,18 +63,18 @@ public:
|
| private:
|
| explicit ScriptRunner(Document*);
|
|
|
| - void timerFired(Timer<ScriptRunner>*);
|
| + void executeScripts();
|
|
|
| void addPendingAsyncScript(ScriptLoader*);
|
|
|
| void movePendingAsyncScript(ScriptRunner*, ScriptLoader*);
|
|
|
| RawPtrWillBeMember<Document> m_document;
|
| - WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteInOrder;
|
| + WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteInOrder;
|
| // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
|
| - WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteSoon;
|
| + WillBeHeapDeque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteSoon;
|
| WillBeHeapHashSet<RawPtrWillBeMember<ScriptLoader> > m_pendingAsyncScripts;
|
| - Timer<ScriptRunner> m_timer;
|
| + CancellableTaskFactory m_executeScriptsTaskFactory;
|
| };
|
|
|
| }
|
|
|