Index: third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
index 554bbf9da159c86221ee88493d13c9461ac800c2..711c08e3a0204327cc520a2f769365e6adce0316 100644 |
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp |
@@ -459,6 +459,7 @@ void ScriptLoader::notifyFinished(Resource* resource) |
ASSERT_UNUSED(resource, resource == m_resource); |
+ ScriptRunner::ExecutionType runOrder = m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION; |
if (m_resource->errorOccurred()) { |
dispatchErrorEvent(); |
// dispatchErrorEvent might move the HTMLScriptElement to a new |
@@ -467,14 +468,10 @@ void ScriptLoader::notifyFinished(Resource* resource) |
contextDocument = m_element->document().contextDocument().get(); |
if (!contextDocument) |
return; |
- contextDocument->scriptRunner()->notifyScriptLoadError(this, m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION); |
+ contextDocument->scriptRunner()->notifyScriptLoadError(this, runOrder); |
return; |
} |
- if (m_willExecuteInOrder) |
- contextDocument->scriptRunner()->notifyScriptReady(this, ScriptRunner::IN_ORDER_EXECUTION); |
- else |
- contextDocument->scriptRunner()->notifyScriptReady(this, ScriptRunner::ASYNC_EXECUTION); |
- |
+ contextDocument->scriptRunner()->notifyScriptReady(this, runOrder); |
m_pendingScript.stopWatchingForLoad(this); |
} |