OLD | NEW |
---|---|
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 |
(...skipping 10 matching lines...) Expand all Loading... | |
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" | 30 #include "platform/Timer.h" |
31 #include "platform/heap/Handle.h" | |
31 #include "wtf/HashMap.h" | 32 #include "wtf/HashMap.h" |
32 #include "wtf/Noncopyable.h" | 33 #include "wtf/Noncopyable.h" |
33 #include "wtf/PassOwnPtr.h" | 34 #include "wtf/PassOwnPtr.h" |
34 #include "wtf/Vector.h" | 35 #include "wtf/Vector.h" |
35 | 36 |
36 namespace WebCore { | 37 namespace WebCore { |
37 | 38 |
38 class ScriptResource; | 39 class ScriptResource; |
39 class Document; | 40 class Document; |
40 class PendingScript; | 41 class PendingScript; |
41 class ScriptLoader; | 42 class ScriptLoader; |
42 | 43 |
43 class ScriptRunner { | 44 class ScriptRunner FINAL : public NoBaseWillBeGarbageCollectedFinalized<ScriptRu nner> { |
44 WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED; | 45 WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
45 public: | 46 public: |
46 static PassOwnPtr<ScriptRunner> create(Document* document) { return adoptPtr (new ScriptRunner(document)); } | 47 static PassOwnPtrWillBeRawPtr<ScriptRunner> create(Document* document) |
48 { | |
49 return adoptPtrWillBeNoop(new ScriptRunner(document)); | |
50 } | |
47 ~ScriptRunner(); | 51 ~ScriptRunner(); |
48 | 52 |
49 enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION }; | 53 enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION }; |
50 void queueScriptForExecution(ScriptLoader*, ResourcePtr<ScriptResource>, Exe cutionType); | 54 void queueScriptForExecution(ScriptLoader*, ResourcePtr<ScriptResource>, Exe cutionType); |
51 bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); } | 55 bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); } |
52 void suspend(); | 56 void suspend(); |
53 void resume(); | 57 void resume(); |
54 void notifyScriptReady(ScriptLoader*, ExecutionType); | 58 void notifyScriptReady(ScriptLoader*, ExecutionType); |
55 void notifyScriptLoadError(ScriptLoader*, ExecutionType); | 59 void notifyScriptLoadError(ScriptLoader*, ExecutionType); |
56 | 60 |
61 void trace(Visitor*); | |
62 | |
57 private: | 63 private: |
58 explicit ScriptRunner(Document*); | 64 explicit ScriptRunner(Document*); |
59 | 65 |
60 void timerFired(Timer<ScriptRunner>*); | 66 void timerFired(Timer<ScriptRunner>*); |
61 | 67 |
62 Document* m_document; | 68 RawPtrWillBeMember<Document> m_document; |
69 // FIXME: Oilpan: consider using heap vectors and hash map here; | |
70 // PendingScript does have a (trivial) destructor, however. | |
haraken
2014/05/29 01:46:08
Just help me understand: What prevents us from mak
sof
2014/05/29 06:02:07
This goes to the core of this CL. If they move to
haraken
2014/05/29 11:32:08
Just help me understand: Where does ~PendingScript
sof
2014/05/29 20:39:54
If you look at ResourceOwner<>::setResource() (Pen
haraken
2014/05/30 01:28:50
I understand your point, but my question is:
If w
sof
2014/05/30 06:26:40
I just don't see how to correctly address the Reso
haraken
2014/05/30 06:49:42
Understood. I'm just wondering if we can eliminate
sof
2014/05/30 09:43:40
The problem is that PendingScript contains a Resou
| |
63 Vector<PendingScript> m_scriptsToExecuteInOrder; | 71 Vector<PendingScript> m_scriptsToExecuteInOrder; |
64 Vector<PendingScript> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs /web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible | 72 Vector<PendingScript> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs /web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible |
65 HashMap<ScriptLoader*, PendingScript> m_pendingAsyncScripts; | 73 HashMap<ScriptLoader*, PendingScript> m_pendingAsyncScripts; |
haraken
2014/05/29 01:46:08
The raw pointers in the key looks safe, since they
| |
66 Timer<ScriptRunner> m_timer; | 74 Timer<ScriptRunner> m_timer; |
67 }; | 75 }; |
68 | 76 |
69 } | 77 } |
70 | 78 |
71 #endif | 79 #endif |
OLD | NEW |