Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Unified Diff: sky/engine/core/script/dart_loader.cc

Issue 951783004: Dart: Renames dart:mojo_blah -> mojo:blah (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/bindings/snapshot.dart ('k') | sky/examples/dart-mojo.sky » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/script/dart_loader.cc
diff --git a/sky/engine/core/script/dart_loader.cc b/sky/engine/core/script/dart_loader.cc
index d3d0bd44a9e5275ca15906914b9f04e5d5c408db..62a72ea0bcce5fdf92917fc7e631448db01ced12 100644
--- a/sky/engine/core/script/dart_loader.cc
+++ b/sky/engine/core/script/dart_loader.cc
@@ -26,7 +26,7 @@ Dart_Handle CanonicalizeURL(DartState* state,
Dart_Handle library,
Dart_Handle url) {
String string = StringFromDart(url);
- if (string.startsWith("dart:"))
+ if (string.startsWith("dart:") || string.startsWith("mojo:"))
return url;
// TODO(dart): Figure out how 'package:' should work in sky.
if (string.startsWith("package:")) {
@@ -194,6 +194,14 @@ Dart_Handle DartLoader::HandleLibraryTag(Dart_LibraryTag tag,
return CanonicalizeURL(DartState::Current(), library, url);
if (tag == Dart_kImportTag) {
CHECK(WTF::isMainThread());
+
+ String string = StringFromDart(url);
+ if (string.startsWith("mojo:")) {
+ Dart_Handle mojo_library = Dart_LookupLibrary(url);
+ LogIfError(mojo_library);
+ return mojo_library;
+ }
+
return DOMDartState::Current()->loader().Import(library, url);
}
if (tag == Dart_kSourceTag) {
« no previous file with comments | « sky/engine/bindings/snapshot.dart ('k') | sky/examples/dart-mojo.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698