Use the new loader mechanism to resolve URIs and load script files in gen_snapshot. This should all…

runtime/bin/loader.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 BIN_LOADER_H_
 #define BIN_LOADER_H_
 
 #include "bin/isolate_data.h"
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "bin/thread.h"
 
 namespace dart {
 namespace bin {
 
 class Loader {
  public:
   explicit Loader(IsolateData* isolate_data);
   ~Loader();
 
   static void InitForSnapshot(const char* snapshot_uri);
 
+  // Loads contents of the specified url.
+  static Dart_Handle LoadUrlContents(Dart_Handle url,
+                                     uint8_t** payload,
+                                     intptr_t* payload_length);
+
+
   // A static tag handler that hides all usage of a loader for an isolate.
   static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                        Dart_Handle library,
                                        Dart_Handle url);
 
   Dart_Handle error() const {
     return error_;
   }
 
  private:
@@ skipping 20 matching lines @@
     char* uri;
     int8_t tag;
 
     void Setup(Dart_CObject* message);
     void Cleanup();
   };
   // An array of I/O results queued from the service isolate.
   IOResult* results_;
   intptr_t results_length_;
   intptr_t results_capacity_;
+  uint8_t* payload_;
+  intptr_t payload_length_;
+  typedef bool (*ProcessResult)(Loader* loader, IOResult* result);
 
   intptr_t results_length() {
     return *static_cast<volatile intptr_t*>(&results_length_);
   }
 
   // Send the loader init request to the service isolate.
   void Init(const char* package_root,
             const char* packages_file,
             const char* working_directory,
             const char* root_script_uri);
 
   // Send a request from the tag handler to the service isolate.
   void SendRequest(Dart_LibraryTag tag,
                    Dart_Handle url,
                    Dart_Handle library_url);
 
   /// Queue |message| and notify the loader that a message is available.
   void QueueMessage(Dart_CObject* message);
 
   /// Blocks the caller until the loader is finished.
-  void BlockUntilComplete();
+  void BlockUntilComplete(ProcessResult process_result);
 
   /// Returns false if |result| is an error and the loader should quit.
-  bool ProcessResultLocked(IOResult* result);
+  static bool ProcessResultLocked(Loader* loader, IOResult* result);
+
+  /// Returns false if |result| is an error and the loader should quit.
+  static bool ProcessUrlLoadResultLocked(Loader* loader, IOResult* result);
 
   /// Returns false if an error occurred and the loader should quit.
-  bool ProcessQueueLocked();
+  bool ProcessQueueLocked(ProcessResult process_result);
 
   // Special inner tag handler for dart: uris.
   static Dart_Handle DartColonLibraryTagHandler(Dart_LibraryTag tag,
                                                 Dart_Handle library,
                                                 Dart_Handle url,
                                                 const char* library_url_string,
                                                 const char* url_string);
 
   // We use one native message handler callback for N loaders. The native
   // message handler callback provides us with the Dart_Port which we use as a
@@ skipping 19 matching lines @@
 
   // This is the global callback for the native message handlers.
   static void NativeMessageHandler(Dart_Port dest_port_id,
                                    Dart_CObject* message);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_LOADER_H_