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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/dom/ScriptRunner.cpp » ('j') | Source/core/dom/ScriptRunner.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ScriptRunner_h 26 #ifndef ScriptRunner_h
27 #define ScriptRunner_h 27 #define ScriptRunner_h
28 28
29 #include "core/fetch/ResourcePtr.h" 29 #include "core/fetch/ResourcePtr.h"
30 #include "platform/Timer.h"
31 #include "platform/heap/Handle.h" 30 #include "platform/heap/Handle.h"
31 #include "platform/scheduler/CancellableTaskFactory.h"
32 #include "wtf/Deque.h"
32 #include "wtf/HashMap.h" 33 #include "wtf/HashMap.h"
33 #include "wtf/Noncopyable.h" 34 #include "wtf/Noncopyable.h"
34 #include "wtf/PassOwnPtr.h" 35 #include "wtf/PassOwnPtr.h"
35 #include "wtf/Vector.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class Document; 39 class Document;
40 class ScriptLoader; 40 class ScriptLoader;
41 41
42 class ScriptRunner final : public NoBaseWillBeGarbageCollectedFinalized<ScriptRu nner> { 42 class ScriptRunner final : public NoBaseWillBeGarbageCollectedFinalized<ScriptRu nner> {
43 WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; 43 WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
44 public: 44 public:
45 static PassOwnPtrWillBeRawPtr<ScriptRunner> create(Document* document) 45 static PassOwnPtrWillBeRawPtr<ScriptRunner> create(Document* document)
(...skipping 10 matching lines...) Expand all
56 void notifyScriptReady(ScriptLoader*, ExecutionType); 56 void notifyScriptReady(ScriptLoader*, ExecutionType);
57 void notifyScriptLoadError(ScriptLoader*, ExecutionType); 57 void notifyScriptLoadError(ScriptLoader*, ExecutionType);
58 58
59 void movePendingAsyncScript(ScriptRunner*, ScriptLoader*); 59 void movePendingAsyncScript(ScriptRunner*, ScriptLoader*);
60 60
61 void trace(Visitor*); 61 void trace(Visitor*);
62 62
63 private: 63 private:
64 explicit ScriptRunner(Document*); 64 explicit ScriptRunner(Document*);
65 65
66 void timerFired(Timer<ScriptRunner>*); 66 void executeScripts();
67 67
68 void addPendingAsyncScript(ScriptLoader*); 68 void addPendingAsyncScript(ScriptLoader*);
69 69
70 RawPtrWillBeMember<Document> m_document; 70 RawPtrWillBeMember<Document> m_document;
71 WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteInOrde r; 71 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
72 // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-wi ll-execute-as-soon-as-possible 72 // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-wi ll-execute-as-soon-as-possible
73 WillBeHeapVector<RawPtrWillBeMember<ScriptLoader> > m_scriptsToExecuteSoon; 73 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.
74 WillBeHeapHashSet<RawPtrWillBeMember<ScriptLoader> > m_pendingAsyncScripts; 74 WillBeHeapHashSet<RawPtrWillBeMember<ScriptLoader> > m_pendingAsyncScripts;
75 Timer<ScriptRunner> m_timer; 75 CancellableTaskFactory m_executeScriptsTaskFactory;
76 }; 76 };
77 77
78 } 78 }
79 79
80 #endif 80 #endif
OLDNEW
« 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