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

Unified Diff: runtime/bin/main.cc

Issue 9694045: Change lookup path for Dart native extensions shared libraries. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fix isAbsolutePath, remove trailing whitespace. Created 8 years, 9 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
« runtime/bin/extensions_linux.cc ('K') | « runtime/bin/file_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index d4e6d14f2b3cf13b8fe25b8ccfefc3b6dd97eccb..12ec0dbab5b182960c05765357798f87afb17b06 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -251,7 +251,7 @@ static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
if (tag == kCanonicalizeUrl) {
// If this is a Dart Scheme URL then it is not modified as it will be
// handled by the VM internally.
- if (is_dart_scheme_url || is_dart_extension_url) {
+ if (is_dart_scheme_url) {
return url;
}
// Resolve the url within the context of the library's URL.
@@ -263,9 +263,16 @@ static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
Dart_Handle dart_args[2];
dart_args[0] = library_url;
dart_args[1] = url;
- return Dart_InvokeStatic(builtin_lib,
- Dart_NewString(""), Dart_NewString("resolveUri"),
- 2, dart_args);
+ if (is_dart_extension_url) {
+ return Dart_InvokeStatic(builtin_lib,
+ Dart_NewString(""),
+ Dart_NewString("resolveExtensionUri"),
+ 2, dart_args);
+ } else {
+ return Dart_InvokeStatic(builtin_lib,
+ Dart_NewString(""), Dart_NewString("resolveUri"),
+ 2, dart_args);
+ }
}
if (is_dart_scheme_url) {
ASSERT(tag == kImportTag);
« runtime/bin/extensions_linux.cc ('K') | « runtime/bin/file_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698