| 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 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/dom/ScriptRunner.h" | 27 #include "core/dom/ScriptRunner.h" |
| 28 | 28 |
| 29 #include "core/dom/Document.h" | 29 #include "core/dom/Document.h" |
| 30 #include "core/dom/Element.h" | 30 #include "core/dom/Element.h" |
| 31 #include "core/dom/PendingScript.h" | 31 #include "core/dom/PendingScript.h" |
| 32 #include "core/dom/ScriptLoader.h" | 32 #include "core/dom/ScriptLoader.h" |
| 33 #include "core/fetch/ScriptResource.h" | 33 #include "core/fetch/ScriptResource.h" |
| 34 #include "platform/heap/Handle.h" |
| 34 | 35 |
| 35 namespace WebCore { | 36 namespace WebCore { |
| 36 | 37 |
| 37 ScriptRunner::ScriptRunner(Document* document) | 38 ScriptRunner::ScriptRunner(Document* document) |
| 38 : m_document(document) | 39 : m_document(document) |
| 39 , m_timer(this, &ScriptRunner::timerFired) | 40 , m_timer(this, &ScriptRunner::timerFired) |
| 40 { | 41 { |
| 41 ASSERT(document); | 42 ASSERT(document); |
| 42 } | 43 } |
| 43 | 44 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 case IN_ORDER_EXECUTION: | 112 case IN_ORDER_EXECUTION: |
| 112 ASSERT(!m_scriptsToExecuteInOrder.isEmpty()); | 113 ASSERT(!m_scriptsToExecuteInOrder.isEmpty()); |
| 113 break; | 114 break; |
| 114 } | 115 } |
| 115 } | 116 } |
| 116 | 117 |
| 117 void ScriptRunner::timerFired(Timer<ScriptRunner>* timer) | 118 void ScriptRunner::timerFired(Timer<ScriptRunner>* timer) |
| 118 { | 119 { |
| 119 ASSERT_UNUSED(timer, timer == &m_timer); | 120 ASSERT_UNUSED(timer, timer == &m_timer); |
| 120 | 121 |
| 121 RefPtr<Document> protect(m_document); | 122 RefPtrWillBeRawPtr<Document> protect(m_document); |
| 122 | 123 |
| 123 Vector<PendingScript> scripts; | 124 Vector<PendingScript> scripts; |
| 124 scripts.swap(m_scriptsToExecuteSoon); | 125 scripts.swap(m_scriptsToExecuteSoon); |
| 125 | 126 |
| 126 size_t numInOrderScriptsToExecute = 0; | 127 size_t numInOrderScriptsToExecute = 0; |
| 127 for (; numInOrderScriptsToExecute < m_scriptsToExecuteInOrder.size() && m_sc
riptsToExecuteInOrder[numInOrderScriptsToExecute].resource()->isLoaded(); ++numI
nOrderScriptsToExecute) | 128 for (; numInOrderScriptsToExecute < m_scriptsToExecuteInOrder.size() && m_sc
riptsToExecuteInOrder[numInOrderScriptsToExecute].resource()->isLoaded(); ++numI
nOrderScriptsToExecute) |
| 128 scripts.append(m_scriptsToExecuteInOrder[numInOrderScriptsToExecute]); | 129 scripts.append(m_scriptsToExecuteInOrder[numInOrderScriptsToExecute]); |
| 129 if (numInOrderScriptsToExecute) | 130 if (numInOrderScriptsToExecute) |
| 130 m_scriptsToExecuteInOrder.remove(0, numInOrderScriptsToExecute); | 131 m_scriptsToExecuteInOrder.remove(0, numInOrderScriptsToExecute); |
| 131 | 132 |
| 132 size_t size = scripts.size(); | 133 size_t size = scripts.size(); |
| 133 for (size_t i = 0; i < size; ++i) { | 134 for (size_t i = 0; i < size; ++i) { |
| 134 ScriptResource* resource = scripts[i].resource(); | 135 ScriptResource* resource = scripts[i].resource(); |
| 135 RefPtr<Element> element = scripts[i].releaseElementAndClear(); | 136 RefPtrWillBeRawPtr<Element> element = scripts[i].releaseElementAndClear(
); |
| 136 toScriptLoaderIfPossible(element.get())->execute(resource); | 137 toScriptLoaderIfPossible(element.get())->execute(resource); |
| 137 m_document->decrementLoadEventDelayCount(); | 138 m_document->decrementLoadEventDelayCount(); |
| 138 } | 139 } |
| 139 } | 140 } |
| 140 | 141 |
| 142 void ScriptRunner::trace(Visitor* visitor) |
| 143 { |
| 144 visitor->trace(m_scriptsToExecuteInOrder); |
| 145 visitor->trace(m_scriptsToExecuteSoon); |
| 146 visitor->trace(m_pendingAsyncScripts); |
| 141 } | 147 } |
| 148 |
| 149 } |
| OLD | NEW |