Change Dart_DefaultCanonicalizeUrl to accept the library url string instead of a library, this is u…

runtime/bin/dartutils.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 
 #include "bin/crypto.h"
 #include "bin/directory.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
@@ skipping 390 matching lines @@
   return Dart_Invoke(DartUtils::BuiltinLib(),
                      DartUtils::NewString("_loadDataAsync"),
                      kNumArgs,
                      dart_args);
 }
 
 
 Dart_Handle DartUtils::LibraryTagHandler(Dart_LibraryTag tag,
                                          Dart_Handle library,
                                          Dart_Handle url) {
+  Dart_Handle library_url = Dart_LibraryUrl(library);
+  if (Dart_IsError(library_url)) {

[Cutch, 2016/06/14 21:38:31]

Should this only happen if library_url is needed? Maybe under the:

if (tag == Dart_kCanonicalizeUrl) {
}

branch?

[siva, 2016/06/14 22:23:29]

If you see further down in the else branch it does extract the library_url
invoking Dart_LibraryUrl(...), so I just hoisted that up.

+    return library_url;
+  }
   if (tag == Dart_kCanonicalizeUrl) {
-    return Dart_DefaultCanonicalizeUrl(library, url);
-  }
-  if (!Dart_IsLibrary(library)) {
-    return Dart_NewApiError("not a library");
+    return Dart_DefaultCanonicalizeUrl(library_url, url);
   }
   if (!Dart_IsString(url)) {
     return Dart_NewApiError("url is not a string");
   }
   const char* url_string = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_string);
   if (Dart_IsError(result)) {
     return result;
   }
-  Dart_Handle library_url = Dart_LibraryUrl(library);
   const char* library_url_string = NULL;
   result = Dart_StringToCString(library_url, &library_url_string);
   if (Dart_IsError(result)) {
     return result;
   }
 
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_string);
   bool is_dart_library = DartUtils::IsDartSchemeURL(library_url_string);
 
   // Handle canonicalization, 'import' and 'part' of 'dart:' libraries.
@@ skipping 834 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart