Reapply "Move isolate loading to a separate loader isolate."

Source/bindings/dart/DartApplicationLoader.h

 // Copyright 2011, 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 12 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef DartApplicationLoader_h
 #define DartApplicationLoader_h
 
+#include "bindings/dart/DartAsyncLoader.h"
 #include "bindings/v8/ScriptSourceCode.h"
 #include "core/html/HTMLScriptElement.h"
 #include "core/html/VoidCallback.h"
 #include <dart_api.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/text/StringHash.h>
 
 namespace WebCore {
 
 class KURL;
 
 class DartApplicationLoader : public RefCounted<DartApplicationLoader> {
 public:
     class ErrorEventDispatcher : public RefCounted<ErrorEventDispatcher> {
     public:
         virtual ~ErrorEventDispatcher() { }
         virtual void dispatchErrorEvent() = 0;
     };
 
-    DartApplicationLoader(Dart_Isolate, Document*, PassRefPtr<ErrorEventDispatcher>, PassRefPtr<VoidCallback> = 0, bool domEnabled = true);
+    DartApplicationLoader(Dart_Isolate, Document*, PassRefPtr<ErrorEventDispatcher>, PassRefPtr<DartAsyncLoader>, bool domEnabled = true);
 
-    void loadScriptResource(const String& url);
-    void load(const String& url, const String& source, WTF::OrdinalNumber startLineNumber);
+    void load(const String& url, const String& source, int startLineNumber);
     const String& mainLibraryURL() const { return m_libraryUrl; }
 
     Document* document() { return m_originDocument; }
 
     static void installLibraryTagHandlerForCurrentIsolate();
 
 private:
     void scriptLoadError(String failedUrl);
-    void loadMainScript(const String& url, const String& source, WTF::OrdinalNumber startLineNumber);
+    void loadMainScript(const String& url, const String& source, int startLineNumber);
 
     static Dart_Handle libraryTagHandlerCallback(Dart_LibraryTag, Dart_Handle library, Dart_Handle urlHandle);
-    static Dart_Handle CanonicalizeUrl(Dart_Handle library, Dart_Handle urlHandle, String url);
     Dart_Handle libraryTagHandler(Dart_LibraryTag, Dart_Handle library, Dart_Handle urlHandle, String url);
 
     Dart_Isolate m_isolate;
     // Client must ensure that DartApplicationLoader doesn't outlive corresponding document.
     Document* m_originDocument;
     RefPtr<ErrorEventDispatcher> m_errorEventDispatcher;
     String m_libraryUrl;
 
     void loadScriptFromSnapshot(const String& url, const uint8_t* snapshot, intptr_t snapshotSize);
     void loadLibrary(const String& url, const String& source);
-    void loadSource(const String& url, const String& source);
     void callEntryPoint();
 
     Dart_Handle topLevelLibrary();
 
     void reportDartError(Dart_Handle);
 
-    typedef HashSet<String> UrlSet;
-    typedef HashMap<String, UrlSet*> UrlMultiMap;
-
-    void add(UrlMultiMap&, const String& key, const String& value);
-
-    // FIXME: we can get rid of imported libs and sources map.
-    UrlSet m_importedLibraries;
-    UrlMultiMap m_importersForSource;
-
-    bool m_mainScriptHasBeenLoaded;
-
     bool m_scriptHasError;
-
-    RefPtr<VoidCallback> m_applicationLoadedCallback;
     bool m_domEnabled;
 
-    friend class ScriptLoadCallback;
+    RefPtr<DartAsyncLoader> m_asyncLoader;
 };
 
 }
 
 #endif // DartApplicationLoader_h