Cherry-pick "Fix for issue 20605, set the application loader state back to running when all the def…

Source/bindings/dart/DartApplicationLoader.cpp

 // Copyright (c) 2009, 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:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 249 matching lines @@
 }
 
 void DartApplicationLoader::load(PassRefPtr<DartErrorEventDispatcher> errorEventDispatcher)
 {
     RELEASE_ASSERT(m_state == Ready || m_state == DeferredReady);
 
     m_errorEventDispatcher = errorEventDispatcher;
 
     DartIsolateScope isolateScope(m_isolate);
     DartApiScope dartApiScope;
+    bool completeFutures = false;
 
-    // Indicate to the VM that all outstanding load requests are done. This
-    // call will finalize all the classes loaded so far and complete all
-    // deferred library load futures.
+    // Finalize classes and complete futures if there are any deferred loads.
+    if (!m_mainInvoked) {
+        RELEASE_ASSERT(m_state == Ready);
+    } else {
+        // We have already invoked the entry point on the main script URL at
+        // this point we will start running dart code again.
+        RELEASE_ASSERT(m_state == DeferredReady);
+        m_state = Running;
+        completeFutures = true;
+    }
     {
         V8Scope v8scope(DartDOMData::current());
-        Dart_Handle result = Dart_FinalizeLoading(true);
+        Dart_Handle result = Dart_FinalizeLoading(completeFutures);
         if (Dart_IsError(result)) {
             reportDartError(result);
             return;
         }
     }
-
     // Invoke the entry point on the main script URL if it has not yet been
     // invoked.
     if (!m_mainInvoked) {
-        RELEASE_ASSERT(m_state == Ready);
         // Call the entry point on the main script URL.
         callEntryPoint();
     }
 }
 
 void DartApplicationLoader::loadScriptFromSnapshot(const String& url, const uint8_t* snapshot, intptr_t snapshotSize)
 {
     // FIXME(vsm): State?
 
     Timeline timeline(m_originDocument->frame(), String("loadSnapshot@") + m_scriptUrlString);
@@ skipping 326 matching lines @@
 void DartApplicationLoader::reportError(const String& error, const String& url)
 {
     if (m_state < Running)
         m_state = Error;
     m_error = true;
     m_loadCallback->reportError(error, url);
 }
 
 
 }