Refactor SourceFile, SourceFileProvider and SourceLocation.

pkg/dart2js_incremental/lib/library_updater.dart

 // Copyright (c) 2014, 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.
 
 library dart2js_incremental.library_updater;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 272 matching lines @@
     _entrySourceFiles.remove(library);
   }
 
   Future<Script> _updatedScript(Script before, LibraryElementX library) {
     if (before == library.entryCompilationUnit.script &&
         _entrySourceFiles.containsKey(library)) {
       return new Future.value(before.copyWithFile(_entrySourceFiles[library]));
     }
 
     return _readUri(before.resourceUri).then((bytes) {
+      Uri uri = before.file.uri;
       String filename = before.file.filename;
       SourceFile sourceFile = bytes is String
-          ? new StringSourceFile(filename, bytes)
-          : new CachingUtf8BytesSourceFile(filename, bytes);
+          ? new StringSourceFile(uri, filename, bytes)
+          : new CachingUtf8BytesSourceFile(uri, filename, bytes);
       return before.copyWithFile(sourceFile);
     });
   }
 
   Future<bool> _haveTagsChanged(LibraryElement library) {
     Script before = library.entryCompilationUnit.script;
     if (!_context._uriHasUpdate(before.resourceUri)) {
       // The entry compilation unit hasn't been updated. So the tags aren't
       // changed.
       return new Future<bool>.value(false);
@@ skipping 1179 matching lines @@
         .buildFieldsHackForIncrementalCompilation(classElement);
     // TODO(ahe): Rewrite for new emitter.
     ClassBuilder builder = new ClassBuilder(classElement, namer);
     classEmitter.emitFields(cls, builder);
     return builder.fields;
   }
 }
 
 // TODO(ahe): Remove this method.
 NO_WARN(x) => x;