Revert of Stop scheduling in-order script execution upon hitting failed script.

third_party/WebKit/Source/core/dom/ScriptRunner.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 111 matching lines @@
     m_isSuspended = false;
 
     for (size_t i = 0; i < m_asyncScriptsToExecuteSoon.size(); ++i) {
         postTask(BLINK_FROM_HERE);
     }
     for (size_t i = 0; i < m_inOrderScriptsToExecuteSoon.size(); ++i) {
         postTask(BLINK_FROM_HERE);
     }
 }
 
-void ScriptRunner::scheduleReadyInOrderScripts()
-{
-    while (!m_pendingInOrderScripts.isEmpty() && m_pendingInOrderScripts.first()->isReady()) {
-        // A ScriptLoader that failed is responsible for cancelling itself
-        // notifyScriptLoadError(); it continues this draining of ready scripts.
-        if (m_pendingInOrderScripts.first()->errorOccurred())
-            break;
-        m_inOrderScriptsToExecuteSoon.append(m_pendingInOrderScripts.takeFirst());
-        postTask(BLINK_FROM_HERE);
-    }
-}
-
 void ScriptRunner::notifyScriptReady(ScriptLoader* scriptLoader, ExecutionType executionType)
 {
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(scriptLoader);
     switch (executionType) {
     case ASYNC_EXECUTION:
         // RELEASE_ASSERT makes us crash in a controlled way in error cases
         // where the ScriptLoader is associated with the wrong ScriptRunner
         // (otherwise we'd cause a use-after-free in ~ScriptRunner when it tries
         // to detach).
         RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_pendingAsyncScripts.contains(scriptLoader));
 
         m_pendingAsyncScripts.remove(scriptLoader);
         m_asyncScriptsToExecuteSoon.append(scriptLoader);
 
         postTask(BLINK_FROM_HERE);
 
         break;
 
     case IN_ORDER_EXECUTION:
         RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_numberOfInOrderScriptsWithPendingNotification > 0);
         m_numberOfInOrderScriptsWithPendingNotification--;
 
-        scheduleReadyInOrderScripts();
+        while (!m_pendingInOrderScripts.isEmpty() && m_pendingInOrderScripts.first()->isReady()) {
+            m_inOrderScriptsToExecuteSoon.append(m_pendingInOrderScripts.takeFirst());
+            postTask(BLINK_FROM_HERE);
+        }
 
         break;
     }
 }
 
 bool ScriptRunner::removePendingInOrderScript(ScriptLoader* scriptLoader)
 {
     for (auto it = m_pendingInOrderScripts.begin(); it != m_pendingInOrderScripts.end(); ++it) {
         if (*it == scriptLoader) {
             m_pendingInOrderScripts.remove(it);
@@ skipping 21 matching lines @@
         RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(foundLoader);
         m_pendingAsyncScripts.remove(scriptLoader);
         break;
     }
     case IN_ORDER_EXECUTION:
         bool foundLoader = removePendingInOrderScript(scriptLoader);
 #if !ENABLE(OILPAN)
         foundLoader = foundLoader || m_isDisposed;
 #endif
         RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(foundLoader);
-        scheduleReadyInOrderScripts();
         break;
     }
     m_document->decrementLoadEventDelayCount();
 }
 
 void ScriptRunner::movePendingScript(Document& oldDocument, Document& newDocument, ScriptLoader* scriptLoader)
 {
     RefPtrWillBeRawPtr<Document> newContextDocument = newDocument.contextDocument().get();
     if (!newContextDocument) {
         // Document's contextDocument() method will return no Document if the
@@ skipping 65 matching lines @@
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_pendingInOrderScripts);
     visitor->trace(m_pendingAsyncScripts);
     visitor->trace(m_asyncScriptsToExecuteSoon);
     visitor->trace(m_inOrderScriptsToExecuteSoon);
 #endif
 }
 
 } // namespace blink