---

yaml
---
r: 263071
b: refs/heads/main
c: d94dd29
h: refs/heads/main
i:
  263069: 02e7aa7
  263067: 050181e
  263063: 6f3db78
  263055: cf6dafb
  263039: 8576234

Author: [email protected]

[refs]

@@ -1994,4 +1994,4 @@ refs/tags/2.14.0-96.0.dev: 1eee24e50fc3028754d9a8e98852b949c04da4e4
 refs/tags/2.14.0-97.0.dev: ba9c1636e87fbdcc02b8bc4a584455c32f8378b4
 refs/tags/2.14.0-98.0.dev: f2d370c93582bbf4da42b5dd4c906d6145b01ea9
 refs/tags/2.14.0-99.0.dev: e722f62b48fb382534efc1f20735def68848006f
-refs/heads/main: 0aa59c48028cd5b4360d5658b558c2c9c294c88e
+refs/heads/main: d94dd29bb8d3a199f51c52f87e0df6ae3cc7d298

trunk/runtime/bin/dartutils.cc

@@ -37,8 +37,8 @@ static bool IsWindowsHost() {
 }
 
 
-static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
-                                 const char* url_string) {
+const char* DartUtils::MapLibraryUrl(CommandLineOptions* url_mapping,
+                                     const char* url_string) {
   ASSERT(url_mapping != NULL);
   // We need to check if the passed in url is found in the url_mapping array,
   // in that case use the mapped entry.
@@ -233,32 +233,42 @@ Dart_Handle DartUtils::ReadStringFromFile(const char* filename) {
 }
 
 
-static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
-                                    Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::ResolveScriptUri(Dart_Handle script_uri,
+                                        Dart_Handle builtin_lib) {
   const int kNumArgs = 3;
   Dart_Handle dart_args[kNumArgs];
-  dart_args[0] = DartUtils::NewString(DartUtils::original_working_directory);
+  dart_args[0] = NewString(original_working_directory);
   dart_args[1] = script_uri;
   dart_args[2] = (IsWindowsHost() ? Dart_True() : Dart_False());
   return Dart_Invoke(builtin_lib,
-                     DartUtils::NewString("_resolveScriptUri"),
+                     NewString("_resolveScriptUri"),
                      kNumArgs,
                      dart_args);
 }
 
 
-static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
-                                   Dart_Handle builtin_lib) {
+Dart_Handle DartUtils::FilePathFromUri(Dart_Handle script_uri,
+                                       Dart_Handle builtin_lib) {
   const int kNumArgs = 2;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = script_uri;
   dart_args[1] = (IsWindowsHost() ? Dart_True() : Dart_False());
-  Dart_Handle script_path = Dart_Invoke(
-      builtin_lib,
-      DartUtils::NewString("_filePathFromUri"),
-      kNumArgs,
-      dart_args);
-  return script_path;
+  return Dart_Invoke(builtin_lib,
+                     NewString("_filePathFromUri"),
+                     kNumArgs,
+                     dart_args);
+}
+
+
+Dart_Handle DartUtils::ResolveUri(Dart_Handle library_url,
+                                  Dart_Handle url,
+                                  Dart_Handle builtin_lib) {
+  const int kNumArgs = 2;
+  Dart_Handle dart_args[kNumArgs];
+  dart_args[0] = library_url;
+  dart_args[1] = url;
+  return Dart_Invoke(
+      builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
 }
 
 
@@ -291,12 +301,7 @@ Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
     if (Dart_IsError(library_url)) {
       return library_url;
     }
-    const int kNumArgs = 2;
-    Dart_Handle dart_args[kNumArgs];
-    dart_args[0] = library_url;
-    dart_args[1] = url;
-    return Dart_Invoke(
-        builtin_lib, NewString("_resolveUri"), kNumArgs, dart_args);
+    return ResolveUri(library_url, url, builtin_lib);
   }
   if (is_dart_scheme_url) {
     ASSERT(tag == kImportTag);
@@ -343,7 +348,7 @@ Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
 
 static Dart_Handle ReadSource(Dart_Handle script_uri,
                               Dart_Handle builtin_lib) {
-  Dart_Handle script_path = FilePathFromUri(script_uri, builtin_lib);
+  Dart_Handle script_path = DartUtils::FilePathFromUri(script_uri, builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }

trunk/runtime/bin/dartutils.h

@@ -144,6 +144,19 @@ class DartUtils {
 
   static void SetOriginalWorkingDirectory();
 
+  static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
+                                   const char* url_string);
+
+  static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
+                                      Dart_Handle builtin_lib);
+
+  static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
+                                     Dart_Handle builtin_lib);
+
+  static Dart_Handle ResolveUri(Dart_Handle library_url,
+                                Dart_Handle url,
+                                Dart_Handle builtin_lib);
+
   // Global state that stores the original working directory..
   static const char* original_working_directory;