| Index: runtime/vm/dart_api_impl.cc
|
| diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
|
| index 1a0fab6568ba112cc25b82fecb27c5ede29ba18e..04790459c56fffc64639e5501a29d2c074acb2f0 100644
|
| --- a/runtime/vm/dart_api_impl.cc
|
| +++ b/runtime/vm/dart_api_impl.cc
|
| @@ -5171,22 +5171,21 @@ DART_EXPORT Dart_Handle Dart_SetLibraryTagHandler(
|
| }
|
|
|
|
|
| -DART_EXPORT Dart_Handle Dart_DefaultCanonicalizeUrl(Dart_Handle library,
|
| +DART_EXPORT Dart_Handle Dart_DefaultCanonicalizeUrl(Dart_Handle library_url,
|
| Dart_Handle url) {
|
| API_TIMELINE_DURATION;
|
| DARTSCOPE(Thread::Current());
|
| CHECK_CALLBACK_STATE(T);
|
|
|
| - const Library& lib = Api::UnwrapLibraryHandle(Z, library);
|
| - if (lib.IsNull()) {
|
| - RETURN_TYPE_ERROR(Z, library, Library);
|
| + const String& lib_uri = Api::UnwrapStringHandle(Z, library_url);
|
| + if (lib_uri.IsNull()) {
|
| + RETURN_TYPE_ERROR(Z, library_url, String);
|
| }
|
| const String& uri = Api::UnwrapStringHandle(Z, url);
|
| if (uri.IsNull()) {
|
| RETURN_TYPE_ERROR(Z, url, String);
|
| }
|
|
|
| - const String& lib_uri = String::Handle(Z, lib.url());
|
| const char* resolved_uri;
|
| if (!ResolveUri(uri.ToCString(), lib_uri.ToCString(), &resolved_uri)) {
|
| return Api::NewError("%s: Unable to canonicalize uri '%s'.",
|
|
|