Support reloading from source on top of a script snapshot.

runtime/vm/isolate_reload.h

 // Copyright (c) 2016, 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.
 
 #ifndef RUNTIME_VM_ISOLATE_RELOAD_H_
 #define RUNTIME_VM_ISOLATE_RELOAD_H_
 
 #include "include/dart_tools_api.h"
 
 #include "vm/hash_map.h"
@@ skipping 118 matching lines @@
   const Class& from_;
   const Class& to_;
 };
 
 
 class IsolateReloadContext {
  public:
   explicit IsolateReloadContext(Isolate* isolate, JSONStream* js);
   ~IsolateReloadContext();
 
-  void Reload(bool force_reload);
+  void Reload(bool force_reload,
+              const char* root_script_url = NULL,
+              const char* packages_url = NULL);
 
   // All zone allocated objects must be allocated from this zone.
   Zone* zone() const { return zone_; }
 
   bool reload_skipped() const { return reload_skipped_; }
   bool reload_aborted() const { return reload_aborted_; }
   RawError* error() const;
   int64_t reload_timestamp() const { return reload_timestamp_; }
 
   static Dart_FileModifiedCallback file_modified_callback() {
@@ skipping 154 matching lines @@
     bool dirty;
   };
   MallocGrowableArray<LibraryInfo> library_infos_;
 
   // A bit vector indicating which of the original libraries were modified.
   BitVector* modified_libs_;
 
   RawClass* OldClassOrNull(const Class& replacement_or_new);
 
   RawLibrary* OldLibraryOrNull(const Library& replacement_or_new);
+
+  RawLibrary* OldLibraryOrNullBaseMoved(const Library& replacement_or_new);
+
   void BuildLibraryMapping();
 
   void AddClassMapping(const Class& replacement_or_new, const Class& original);
 
   void AddLibraryMapping(const Library& replacement_or_new,
                          const Library& original);
 
   void AddStaticFieldMapping(const Field& old_field, const Field& new_field);
 
   void AddBecomeMapping(const Object& old, const Object& neu);
   void AddEnumBecomeMapping(const Object& old, const Object& neu);
 
   void RebuildDirectSubclasses();
 
   RawClass* MappedClass(const Class& replacement_or_new);
   RawLibrary* MappedLibrary(const Library& replacement_or_new);
 
-  RawObject** from() { return reinterpret_cast<RawObject**>(&script_uri_); }
-  RawString* script_uri_;
+  RawObject** from() { return reinterpret_cast<RawObject**>(&script_url_); }
+  RawString* script_url_;
   RawError* error_;
   RawArray* old_classes_set_storage_;
   RawArray* class_map_storage_;
   RawArray* old_libraries_set_storage_;
   RawArray* library_map_storage_;
   RawArray* become_map_storage_;
   RawGrowableObjectArray* become_enum_mappings_;
   RawLibrary* saved_root_library_;
   RawGrowableObjectArray* saved_libraries_;
-  RawObject** to() { return reinterpret_cast<RawObject**>(&saved_libraries_); }
+  RawString* root_url_prefix_;
+  RawString* old_root_url_prefix_;
+  RawObject** to() {
+    return reinterpret_cast<RawObject**>(&old_root_url_prefix_);
+  }
 
   friend class Isolate;
   friend class Class;  // AddStaticFieldMapping, AddEnumBecomeMapping.
   friend class Library;
   friend class ObjectLocator;
   friend class MarkFunctionsForRecompilation;  // IsDirty.
   friend class ReasonForCancelling;
 
   static Dart_FileModifiedCallback file_modified_callback_;
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_ISOLATE_RELOAD_H_