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

Unified Diff: runtime/bin/dartutils.cc

Issue 16092007: HTTP loading tests and package root support (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 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
Index: runtime/bin/dartutils.cc
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 93750d7aceab1b67f56f98e4aa4ad40432147b3e..b2e21e529a2588e43e1aacb2662f6ebba31495f1 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -401,7 +401,7 @@ static Dart_Handle ParseHttpUri(const char* script_uri, const char** host_str,
if (Dart_IsError(path)) {
return path;
}
- Dart_Handle host = DartUtils::DomainFromUri(uri, builtin_lib);
+ Dart_Handle host = DartUtils::HostFromUri(uri, builtin_lib);
if (Dart_IsError(host)) {
return host;
}
@@ -526,9 +526,9 @@ Dart_Handle DartUtils::PathFromUri(Dart_Handle script_uri,
}
-Dart_Handle DartUtils::DomainFromUri(Dart_Handle script_uri,
- Dart_Handle builtin_lib) {
- return SingleArgDart_Invoke(script_uri, builtin_lib, "_domainFromHttpUri");
+Dart_Handle DartUtils::HostFromUri(Dart_Handle script_uri,
+ Dart_Handle builtin_lib) {
+ return SingleArgDart_Invoke(script_uri, builtin_lib, "_hostFromHttpUri");
}
@@ -713,14 +713,16 @@ Dart_Handle DartUtils::LoadScriptHttp(const char* script_uri,
Dart_Handle DartUtils::LoadScript(const char* script_uri,
Dart_Handle builtin_lib) {
- if (DartUtils::IsHttpSchemeURL(script_uri)) {
- return LoadScriptHttp(script_uri, builtin_lib);
- }
Dart_Handle resolved_script_uri;
+ // Always call ResolveScriptUri so that the base path is set.
siva 2013/05/31 20:36:29 From the comment it is not clear which base path i
Cutch 2013/05/31 22:37:19 Done.
resolved_script_uri = ResolveScriptUri(NewString(script_uri), builtin_lib);
if (Dart_IsError(resolved_script_uri)) {
return resolved_script_uri;
}
+ // Handle http: requests separately.
+ if (DartUtils::IsHttpSchemeURL(script_uri)) {
siva 2013/05/31 20:36:29 A NewString(script_uri) was done above and again i
Cutch 2013/05/31 22:37:19 Done.
+ return LoadScriptHttp(script_uri, builtin_lib);
+ }
Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
builtin_lib);
if (Dart_IsError(script_path)) {

Powered by Google App Engine
This is Rietveld 408576698