Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(916)

Unified Diff: Source/core/dom/ScriptRunner.h

Issue 866273005: Teach ScriptRunner how to yield and post on loading task queue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Dont run scripts that are not ready Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/dom/ScriptRunner.cpp » ('j') | Source/core/dom/ScriptRunner.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ScriptRunner.h
diff --git a/Source/core/dom/ScriptRunner.h b/Source/core/dom/ScriptRunner.h
index 42afd02d27362e63c239d73996cea1061cf80ad3..95bcddf61459471c6e9dd7a8556cd35dc5ecc6c6 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,16 +63,16 @@ public:
private:
explicit ScriptRunner(Document*);
- void timerFired(Timer<ScriptRunner>*);
+ void executeScripts();
void addPendingAsyncScript(ScriptLoader*);
RawPtrWillBeMember<Document> m_document;
- WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteInOrder;
+ Deque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteInOrder;
Sami 2015/02/10 18:40:01 Should this be WillBeHeapDeque?
alex clarke (OOO till 29th) 2015/02/18 18:28:20 I suppose so. I have to admit I'm not sure of the
// http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
- WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteSoon;
+ Deque<RawPtrWillBeMember<ScriptLoader>> m_scriptsToExecuteSoon;
Sami 2015/02/10 18:40:01 Ditto.
alex clarke (OOO till 29th) 2015/02/18 18:28:20 Done.
WillBeHeapHashSet<RawPtrWillBeMember<ScriptLoader> > m_pendingAsyncScripts;
- Timer<ScriptRunner> m_timer;
+ CancellableTaskFactory m_executeScriptsTaskFactory;
};
}
« no previous file with comments | « no previous file | Source/core/dom/ScriptRunner.cpp » ('j') | Source/core/dom/ScriptRunner.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698