Fix package relative imports

Source/bindings/dart/DartUtilities.cpp

 // Copyright 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 1076 matching lines @@
 {
     static const uint8_t snapshotBuffer[] = {
 // DartSnapshot.bytes is generated by build system.
 #include "DartSnapshot.bytes"
     };
     return snapshotBuffer;
 }
 
 Dart_Handle DartUtilities::canonicalizeUrl(Dart_Handle library, Dart_Handle urlHandle, String url)
 {
-    if (url.startsWith("dart:") || url.startsWith("package:"))
+    DEFINE_STATIC_LOCAL(String, dartPrefix, ("dart:"));
+    DEFINE_STATIC_LOCAL(String, packagePrefix, ("package:"));
+
+    if (url.startsWith(dartPrefix) || url.startsWith(packagePrefix))
+        // Not a relative URL.
         return urlHandle;
 
     Dart_Handle libraryURLHandle = Dart_LibraryUrl(library);
     ASSERT(!Dart_IsError(libraryURLHandle));
     String libraryURL = DartUtilities::toString(libraryURLHandle);
 
-    bool packageScheme = false;
+    String result;
+    if (libraryURL.startsWith(packagePrefix) && !libraryURL.startsWith("package://")) {
+        // KURL expects a URL with an authority. If the library URL is
+        // "package:<path>", we convert to "package://_/<path>" for resolution
+        // and convert back.
+        DEFINE_STATIC_LOCAL(String, resolvePrefix, ("package://_/"));
 
-    const char* kPackagePrefix = "package:";
-    const int kPackagePrefixLength = strlen(kPackagePrefix);
-
-    const char* kHttpPrefix = "http://";
-    const int kHttpPrefixLength = strlen(kHttpPrefix);
-
-    if (libraryURL.startsWith(kPackagePrefix)) {
-        // KURL has problems concating package:foo/bar (without slashes right after colon)
-        // and relative urls. Therefore pretend to be a standard absolute URL.
-        packageScheme = true;
-        libraryURL = kHttpPrefix + libraryURL.substring(kPackagePrefixLength);
+        libraryURL = resolvePrefix + libraryURL.substring(packagePrefix.length());
+        result = KURL(KURL(KURL(), libraryURL), url).string();
+        if (result.startsWith(resolvePrefix))
+            result = packagePrefix + result.substring(resolvePrefix.length());
+    } else {
+        result = KURL(KURL(KURL(), libraryURL), url).string();
     }
 
-    const KURL canonical = KURL(KURL(KURL(), libraryURL), url);
-    String result = canonical.string();
-    if (packageScheme)
-        result = kPackagePrefix + result.substring(kHttpPrefixLength);
     return DartUtilities::stringToDartString(result);
 }
 
 void DartUtilities::reportProblem(ExecutionContext* context, const String& error, int line, int col)
 {
     String sourceURL = context->url().string();
     // FIXME: Pass in stack trace.
     if (context && context->isDocument()) {
         static_cast<Document*>(context)->reportException(ErrorEvent::create(error, sourceURL, line, col, 0), nullptr, NotSharableCrossOrigin);
     }
@@ skipping 75 matching lines @@
     if (!v) {
         return 0;
     }
     ASSERT(valueLen > 0 && static_cast<size_t>(valueLen) > strlen(v));
     strncpy(value, v, valueLen);
     value[valueLen - 1] = '\0';
     return strlen(value);
 #endif
 }
 }