Allow sky apps to be consumers of mojo services

sky/engine/core/script/dart_loader.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/config.h"
 #include "sky/engine/core/script/dart_loader.h"
 
 #include "base/callback.h"
 #include "mojo/common/data_pipe_drainer.h"
 #include "sky/engine/core/script/dart_dependency_catcher.h"
+#include "sky/engine/core/script/dom_dart_state.h"
 #include "sky/engine/platform/fetcher/MojoFetcher.h"
 #include "sky/engine/platform/weborigin/KURL.h"
 #include "sky/engine/tonic/dart_api_scope.h"
 #include "sky/engine/tonic/dart_converter.h"
 #include "sky/engine/tonic/dart_error.h"
 #include "sky/engine/tonic/dart_isolate_scope.h"
+#include "sky/engine/wtf/MainThread.h"
 
 using mojo::common::DataPipeDrainer;
 
 namespace blink {
 namespace {
 
 Dart_Handle CanonicalizeURL(DartState* state,
                             Dart_Handle library,
                             Dart_Handle url) {
   String string = StringFromDart(url);
   if (string.startsWith("dart:"))
     return url;
+  // TODO(dart): Figure out how 'package:' should work in sky.
+  if (string.startsWith("package:")) {
+    string.replace("package:", "/gen/");
+  }
   String library_url_string = StringFromDart(Dart_LibraryUrl(library));
   KURL library_url = KURL(ParsedURLString, library_url_string);
   KURL resolved_url = KURL(library_url, string);
   return StringToDart(state, resolved_url.string());
 }
 
 }  // namespace
 
 // A DartLoader::Job represents a network load. It fetches data from the network
 // and buffers the data in Vector. To cancel the job, delete this object.
@@ skipping 135 matching lines @@
 
 DartLoader::~DartLoader() {
 }
 
 Dart_Handle DartLoader::HandleLibraryTag(Dart_LibraryTag tag,
                                          Dart_Handle library,
                                          Dart_Handle url) {
   DCHECK(Dart_IsLibrary(library));
   DCHECK(Dart_IsString(url));
   if (tag == Dart_kCanonicalizeUrl)
-    return CanonicalizeURL(dart_state_.get(), library, url);
-  if (tag == Dart_kImportTag)
-    return Import(library, url);
-  if (tag == Dart_kSourceTag)
-    return Source(library, url);
+    return CanonicalizeURL(DartState::Current(), library, url);
+  if (tag == Dart_kImportTag) {
+    CHECK(WTF::isMainThread());
+    return DOMDartState::Current()->loader().Import(library, url);
+  }
+  if (tag == Dart_kSourceTag) {
+    CHECK(WTF::isMainThread());
+    return DOMDartState::Current()->loader().Source(library, url);
+  }
   DCHECK(false);
   return Dart_NewApiError("Unknown library tag.");
 }
 
 void DartLoader::WaitForDependencies(
     const HashSet<DartDependency*>& dependencies,
     const base::Closure& callback) {
   dependency_watchers_.add(
       adoptPtr(new DependencyWatcher(dependencies, callback)));
 }
@@ skipping 47 matching lines @@
 
   LogIfError(Dart_LoadSource(
       Dart_HandleFromPersistent(job->library()),
       StringToDart(dart_state_.get(), job->url().string()),
       Dart_NewStringFromUTF8(buffer.data(), buffer.size()), 0, 0));
 
   jobs_.remove(job);
 }
 
 }  // namespace blink