Chromium Code Reviews| Index: sdk/lib/_internal/compiler/implementation/compiler.dart |
| diff --git a/sdk/lib/_internal/compiler/implementation/compiler.dart b/sdk/lib/_internal/compiler/implementation/compiler.dart |
| index 75a1eaacbc5fbe8e619089f933edfa3dd9f52158..41158834b093873531ed894fba774e04cb9cf0f5 100644 |
| --- a/sdk/lib/_internal/compiler/implementation/compiler.dart |
| +++ b/sdk/lib/_internal/compiler/implementation/compiler.dart |
| @@ -589,7 +589,7 @@ abstract class Compiler implements DiagnosticListener { |
| // TODO(karlklose,floitsch): move this to the javascript backend. |
| /** Enable the 'JS' helper for a library if needed. */ |
| void maybeEnableJSHelper(LibraryElement library) { |
| - String libraryName = library.uri.toString(); |
| + String libraryName = library.canonicalUri.toString(); |
| bool nativeTest = library.entryCompilationUnit.script.name.contains( |
| 'dart/tests/compiler/dart2js_native'); |
| if (nativeTest |
| @@ -623,7 +623,7 @@ abstract class Compiler implements DiagnosticListener { |
| } |
| void maybeEnableIsolateHelper(LibraryElement library) { |
| - String libraryName = library.uri.toString(); |
| + String libraryName = library.canonicalUri.toString(); |
| if (libraryName == 'dart:isolate' |
| || libraryName == 'dart:html' |
| // TODO(floitsch): create a separate async-helper library instead of |
| @@ -944,7 +944,30 @@ abstract class Compiler implements DiagnosticListener { |
| return spanFromTokens(token, token, uri); |
| } |
| - Script readScript(Uri uri, [Node node]) { |
| + /** |
| + * Resolves the [absoluteUri] into a readable URI. |
| + * |
| + * The [importingLibrary] holds the library importing [absoluteUri] or |
| + * [:null:] if [absoluteUri] is loaded as the main library. The |
| + * [importingLibrary] is used to grant access to internal libraries from |
| + * platform libraries and patch libraries. |
| + * |
| + * This method is responsible for reporting errors if the [absoluteUri] is |
| + * not accessible from [importingLibrary] and returns [:null:] in this case. |
|
ahe
2013/01/24 10:00:57
Depending on how you respond to my comment in apii
Johnni Winther
2013/01/24 13:04:59
Done.
|
| + * |
| + * See [LibraryLoader] for terminology on URIs. |
| + */ |
| + Uri resolveAbsoluteUri(LibraryElement importingLibrary, |
| + Uri absoluteUri, Node node) { |
| + unimplemented('Compiler.resolveAbsoluteUri'); |
| + } |
| + |
| + /** |
| + * Reads the script specified by the [readableUri]. |
| + * |
| + * See [LibraryLoader] for terminology on URIs. |
| + */ |
| + Script readScript(Uri readableUri, [Node node]) { |
| unimplemented('Compiler.readScript'); |
| } |