Factor DartLibraryProvider out of DartLoader

sky/engine/core/script/dart_controller.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/engine/core/script/dart_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
 #include "dart/runtime/bin/embedded_dart_io.h"
 #include "dart/runtime/include/dart_mirrors_api.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/bindings/builtin.h"
 #include "sky/engine/bindings/builtin_natives.h"
 #include "sky/engine/bindings/builtin_sky.h"
 #include "sky/engine/core/app/AbstractModule.h"
 #include "sky/engine/core/app/Module.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/html/HTMLScriptElement.h"
 #include "sky/engine/core/html/imports/HTMLImport.h"
 #include "sky/engine/core/html/imports/HTMLImportChild.h"
 #include "sky/engine/core/loader/FrameLoaderClient.h"
 #include "sky/engine/core/script/dart_debugger.h"
-#include "sky/engine/core/script/dart_dependency_catcher.h"
-#include "sky/engine/core/script/dart_loader.h"
+#include "sky/engine/core/script/dart_library_provider_network.h"
 #include "sky/engine/core/script/dart_service_isolate.h"
-#include "sky/engine/core/script/dart_snapshot_loader.h"
 #include "sky/engine/core/script/dom_dart_state.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/tonic/dart_api_scope.h"
 #include "sky/engine/tonic/dart_class_library.h"
+#include "sky/engine/tonic/dart_dependency_catcher.h"
 #include "sky/engine/tonic/dart_error.h"
 #include "sky/engine/tonic/dart_gc_controller.h"
 #include "sky/engine/tonic/dart_invoke.h"
 #include "sky/engine/tonic/dart_isolate_scope.h"
+#include "sky/engine/tonic/dart_library_loader.h"
+#include "sky/engine/tonic/dart_snapshot_loader.h"
 #include "sky/engine/tonic/dart_state.h"
 #include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/wtf/text/TextPosition.h"
 
 namespace blink {
 namespace {
 
 void CreateEmptyRootLibraryIfNeeded() {
   if (Dart_IsNull(Dart_RootLibrary())) {
     Dart_LoadScript(Dart_NewStringFromCString("dart:empty"), Dart_EmptyString(),
                     0, 0);
   }
 }
 
+PassOwnPtr<DartLibraryProviderNetwork::PrefetchedLibrary>
+CreatePrefetchedLibraryIfNeeded(const KURL& url,
+                                mojo::URLResponsePtr response) {
+  OwnPtr<DartLibraryProviderNetwork::PrefetchedLibrary> prefetched;
+  if (response && response->status_code == 200) {
+    prefetched = adoptPtr(new DartLibraryProviderNetwork::PrefetchedLibrary());
+    prefetched->name = url.string();
+    prefetched->pipe = response->body.Pass();
+  }
+  return prefetched.release();
+}
+
 } // namespace
 
 #if ENABLE(DART_STRICT)
 static const char* kCheckedModeArgs[] = {"--enable_asserts",
                                          "--enable_type_checks",
                                          "--error_on_bad_type",
                                          "--error_on_bad_override",
 #if WTF_OS_IOS
                                          "--no-profile"
 #endif
@@ skipping 70 matching lines @@
   // TODO(eseidel): We need to load a 404 page instead!
   if (LogIfError(library))
     return;
   DartInvokeAppField(library, ToDart("main"), 0, nullptr);
 }
 
 void DartController::LoadMainLibrary(const KURL& url, mojo::URLResponsePtr response) {
   DartState::Scope scope(dart_state());
   CreateEmptyRootLibraryIfNeeded();
 
-  DartLoader& loader = dart_state()->loader();
+  library_provider_ = adoptPtr(new DartLibraryProviderNetwork(
+      CreatePrefetchedLibraryIfNeeded(url, response.Pass())));
+
+  DartLibraryLoader& loader = dart_state()->library_loader();
+  loader.set_library_provider(library_provider_.get());
+
   DartDependencyCatcher dependency_catcher(loader);
-  loader.LoadLibrary(url, response.Pass());
+  loader.LoadLibrary(url.string());
   loader.WaitForDependencies(dependency_catcher.dependencies(),
                              base::Bind(&DartController::DidLoadMainLibrary, weak_factory_.GetWeakPtr(), url));
 }
 
 void DartController::DidLoadSnapshot() {
   DCHECK(Dart_CurrentIsolate() == nullptr);
   snapshot_loader_ = nullptr;
 
   Dart_Isolate isolate = dart_state()->isolate();
   DartIsolateScope isolate_scope(isolate);
   DartApiScope dart_api_scope;
 
   Dart_Handle library = Dart_RootLibrary();
   if (LogIfError(library))
     return;
   DartInvokeAppField(library, ToDart("main"), 0, nullptr);
 }
 
 void DartController::LoadSnapshot(const KURL& url, mojo::URLResponsePtr response) {
   snapshot_loader_ = adoptPtr(new DartSnapshotLoader(dart_state()));
-  snapshot_loader_->LoadSnapshot(url, response.Pass(),
+  snapshot_loader_->LoadSnapshot(
+      response->body.Pass(),
       base::Bind(&DartController::DidLoadSnapshot, weak_factory_.GetWeakPtr()));
 }
 
 void DartController::LoadScriptInModule(
     AbstractModule* module,
     const String& source,
     const TextPosition& position,
     const LoadFinishedCallback& finished_callback) {
   DartState::Scope scope(dart_state());
   CreateEmptyRootLibraryIfNeeded();
 
-  DartDependencyCatcher dependency_catcher(dart_state()->loader());
+  DartLibraryLoader& loader = dart_state()->library_loader();
+
+  if (!library_provider_) {
+    library_provider_ = adoptPtr(new DartLibraryProviderNetwork(nullptr));
+    loader.set_library_provider(library_provider_.get());
+  }
+
+  DartDependencyCatcher dependency_catcher(loader);
   Dart_Handle library_handle = CreateLibrary(module, source, position);
   if (!library_handle)
     return finished_callback.Run(nullptr, nullptr);
   RefPtr<DartValue> library = DartValue::Create(dart_state(), library_handle);
   module->AddLibrary(library, position);
 
   // TODO(eseidel): Better if the library/module retained its dependencies and
   // dependency waiting could be separate from library creation.
-  dart_state()->loader().WaitForDependencies(
+  dart_state()->library_loader().WaitForDependencies(
       dependency_catcher.dependencies(),
       base::Bind(finished_callback, module, library));
 }
 
 void DartController::ExecuteLibraryInModule(AbstractModule* module,
                                             Dart_Handle library,
                                             HTMLScriptElement* script) {
   TRACE_EVENT1("sky", "DartController::ExecuteLibraryInModule",
                "url", module->url().ascii().toStdString());
   ASSERT(library);
@@ skipping 22 matching lines @@
   DartInvokeAppField(library, ToDart(name), arraysize(args), args);
 }
 
 static void UnhandledExceptionCallback(Dart_Handle error) {
   LOG(ERROR) << Dart_GetError(error);
 }
 
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                      Dart_Handle library,
                                      Dart_Handle url) {
-  return DartLoader::HandleLibraryTag(tag, library, url);
+  return DartLibraryLoader::HandleLibraryTag(tag, library, url);
 }
 
 static void IsolateShutdownCallback(void* callback_data) {
   // TODO(dart)
 }
 
 static bool IsServiceIsolateURL(const char* url_name) {
   return url_name != nullptr &&
       String(url_name) == DART_VM_SERVICE_ISOLATE_NAME;
 }
@@ skipping 177 matching lines @@
                         nullptr,  // Isolate interrupt callback.
                         UnhandledExceptionCallback, IsolateShutdownCallback,
                         // File IO callbacks.
                         nullptr, nullptr, nullptr, nullptr, nullptr));
   // Wait for load port- ensures handle watcher and service isolates are
   // running.
   Dart_ServiceWaitForLoadPort();
 }
 
 } // namespace blink