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

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

Issue 18261015: Rename ScriptElement to ScriptLoader (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | « Source/core/dom/ScriptRunner.h ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ScriptRunner.cpp
diff --git a/Source/core/dom/ScriptRunner.cpp b/Source/core/dom/ScriptRunner.cpp
index 706a1d1a468ee66b97bbff434dc506f5ad750bc7..db5f7a54deae2f09b532d10807eb1e3b134b04b4 100644
--- a/Source/core/dom/ScriptRunner.cpp
+++ b/Source/core/dom/ScriptRunner.cpp
@@ -29,7 +29,7 @@
#include "core/dom/Document.h"
#include "core/dom/Element.h"
#include "core/dom/PendingScript.h"
-#include "core/dom/ScriptElement.h"
+#include "core/dom/ScriptLoader.h"
#include "core/loader/cache/CachedScript.h"
namespace WebCore {
@@ -51,12 +51,12 @@ ScriptRunner::~ScriptRunner()
m_document->decrementLoadEventDelayCount();
}
-void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedResourceHandle<CachedScript> cachedScript, ExecutionType executionType)
+void ScriptRunner::queueScriptForExecution(ScriptLoader* scriptLoader, CachedResourceHandle<CachedScript> cachedScript, ExecutionType executionType)
{
- ASSERT(scriptElement);
+ ASSERT(scriptLoader);
ASSERT(cachedScript.get());
- Element* element = scriptElement->element();
+ Element* element = scriptLoader->element();
ASSERT(element);
ASSERT(element->inDocument());
@@ -64,7 +64,7 @@ void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedR
switch (executionType) {
case ASYNC_EXECUTION:
- m_pendingAsyncScripts.add(scriptElement, PendingScript(element, cachedScript.get()));
+ m_pendingAsyncScripts.add(scriptLoader, PendingScript(element, cachedScript.get()));
break;
case IN_ORDER_EXECUTION:
@@ -84,12 +84,12 @@ void ScriptRunner::resume()
m_timer.startOneShot(0);
}
-void ScriptRunner::notifyScriptReady(ScriptElement* scriptElement, ExecutionType executionType)
+void ScriptRunner::notifyScriptReady(ScriptLoader* scriptLoader, ExecutionType executionType)
{
switch (executionType) {
case ASYNC_EXECUTION:
- ASSERT(m_pendingAsyncScripts.contains(scriptElement));
- m_scriptsToExecuteSoon.append(m_pendingAsyncScripts.take(scriptElement));
+ ASSERT(m_pendingAsyncScripts.contains(scriptLoader));
+ m_scriptsToExecuteSoon.append(m_pendingAsyncScripts.take(scriptLoader));
break;
case IN_ORDER_EXECUTION:
@@ -118,7 +118,7 @@ void ScriptRunner::timerFired(Timer<ScriptRunner>* timer)
for (size_t i = 0; i < size; ++i) {
CachedScript* cachedScript = scripts[i].cachedScript();
RefPtr<Element> element = scripts[i].releaseElementAndClear();
- toScriptElementIfPossible(element.get())->execute(cachedScript);
+ toScriptLoaderIfPossible(element.get())->execute(cachedScript);
m_document->decrementLoadEventDelayCount();
}
}
« no previous file with comments | « Source/core/dom/ScriptRunner.h ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698