Add patch file support to Dart embedder

mojo/dart/embedder/dart_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/sys_info.h"
 #include "crypto/random.h"
@@ skipping 107 matching lines @@
       return result;
     }
     bool is_dart_scheme_url = IsDartSchemeURL(url_string);
     // If this is a Dart Scheme URL then it is not modified as it will be
     // handled internally.
     if (is_dart_scheme_url) {
       return url;
     }
     // Resolve the url within the context of the library's URL.
     Dart_Handle builtin_lib =
-        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+        Builtin::GetLibrary(Builtin::kBuiltinLibrary);
     return ResolveUri(library_url, url, builtin_lib);
   }
 
   Dart_Handle builtin_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+      Builtin::GetLibrary(Builtin::kBuiltinLibrary);
   // Handle 'import' or 'part' requests for all other URIs. Call dart code to
   // read the source code asynchronously.
   return LoadDataAsync_Invoke(
       Dart_NewInteger(tag), url, library_url, builtin_lib, Dart_Null());
 }
 
 static Dart_Handle SetWorkingDirectory(Dart_Handle builtin_lib) {
   base::FilePath current_dir;
   PathService::Get(base::DIR_CURRENT, &current_dir);
 
@@ skipping 14 matching lines @@
   // First ensure all required libraries are available.
   Dart_Handle url = Dart_NewStringFromCString(kAsyncLibURL);
   DART_CHECK_VALID(url);
   Dart_Handle async_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(async_lib);
   url = Dart_NewStringFromCString(kIsolateLibURL);
   DART_CHECK_VALID(url);
   Dart_Handle isolate_lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(isolate_lib);
   Dart_Handle mojo_core_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kMojoCoreLibrary);
+      Builtin::GetLibrary(Builtin::kMojoCoreLibrary);
   DART_CHECK_VALID(mojo_core_lib);
 
   // We need to ensure that all the scripts loaded so far are finalized
   // as we are about to invoke some Dart code below to setup closures.
   Dart_Handle result = Dart_FinalizeLoading(false);
   DART_CHECK_VALID(result);
 
   // Setup the internal library's 'internalPrint' function.
   Dart_Handle print = Dart_Invoke(builtin_lib,
                                   Dart_NewStringFromCString("_getPrintClosure"),
@@ skipping 39 matching lines @@
 
   // Set up package root.
   result = Dart_NewStringFromUTF8(
       reinterpret_cast<const uint8_t*>(package_root.c_str()),
       package_root.length());
   DART_CHECK_VALID(result);
 
   const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = result;
-  return Dart_Invoke(builtin_lib,
+  result = Dart_Invoke(builtin_lib,
                      Dart_NewStringFromCString("_setPackageRoot"),
                      kNumArgs,
                      dart_args);
-
+  DART_CHECK_VALID(result);
   return result;
 }
 
 static Dart_Isolate CreateServiceIsolateHelper(const char* script_uri,
                                                char** error) {
   // TODO(johnmccutchan): Add support the service isolate.
   // No callbacks for service isolate.
   IsolateCallbacks callbacks;
   IsolateData* isolate_data =
       new IsolateData(NULL, false, callbacks, "", "", "");
@@ skipping 31 matching lines @@
   }
 
   DPCHECK(!Dart_IsServiceIsolate(isolate));
   Dart_EnterScope();
 
   Dart_IsolateSetStrictCompilation(strict_compilation);
 
   // Setup the native resolvers for the builtin libraries as they are not set
   // up when the snapshot is read.
   CHECK(snapshot_buffer != nullptr);
-  Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
-  Builtin::SetNativeResolver(Builtin::kMojoCoreLibrary);
+  Builtin::PrepareLibrary(Builtin::kBuiltinLibrary);
+  Builtin::PrepareLibrary(Builtin::kMojoCoreLibrary);
 
   if (!callbacks.create.is_null()) {
     callbacks.create.Run(script_uri.c_str(),
                          "main",
                          package_root.c_str(),
                          isolate_data,
                          error);
   }
 
   // Set up the library tag handler for this isolate.
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   DART_CHECK_VALID(result);
 
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   // The builtin library is part of the snapshot and is already available.
   Dart_Handle builtin_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+      Builtin::GetLibrary(Builtin::kBuiltinLibrary);
   DART_CHECK_VALID(builtin_lib);
 
   result = PrepareScriptForLoading(package_root, builtin_lib);
   DART_CHECK_VALID(result);
 
   Dart_Handle uri = Dart_NewStringFromUTF8(
       reinterpret_cast<const uint8_t*>(script_uri.c_str()),
       script_uri.length());
   DART_CHECK_VALID(uri);
 
@@ skipping 139 matching lines @@
   if (isolate == nullptr) {
     return false;
   }
 
   Dart_EnterIsolate(isolate);
   Dart_Handle result;
   Dart_EnterScope();
 
   // Start the MojoHandleWatcher.
   Dart_Handle mojo_core_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kMojoCoreLibrary);
+      Builtin::GetLibrary(Builtin::kMojoCoreLibrary);
   DART_CHECK_VALID(mojo_core_lib);
   Dart_Handle handle_watcher_type = Dart_GetType(
       mojo_core_lib,
       Dart_NewStringFromCString("MojoHandleWatcher"),
       0,
       nullptr);
   DART_CHECK_VALID(handle_watcher_type);
   result = Dart_Invoke(
       handle_watcher_type,
       Dart_NewStringFromCString("_start"),
       0,
       nullptr);
   DART_CHECK_VALID(result);
 
   // RunLoop until the handle watcher isolate is spun-up.
   result = Dart_RunLoop();
   DART_CHECK_VALID(result);
 
   // Load the root library into the builtin library so that main can be found.
   Dart_Handle builtin_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+      Builtin::GetLibrary(Builtin::kBuiltinLibrary);
   DART_CHECK_VALID(builtin_lib);
   Dart_Handle root_lib = Dart_RootLibrary();
   DART_CHECK_VALID(root_lib);
   result = Dart_LibraryImportLibrary(builtin_lib, root_lib, Dart_Null());
   DART_CHECK_VALID(result);
 
   if (config.compile_all) {
     result = Dart_CompileAll();
     DART_CHECK_VALID(result);
   }
@@ skipping 69 matching lines @@
     initialized_ = false;
     return false;
   }
 
   Dart_EnterIsolate(root_isolate_);
   Dart_Handle result;
   Dart_EnterScope();
 
   // Start the MojoHandleWatcher.
   Dart_Handle mojo_core_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kMojoCoreLibrary);
+      Builtin::GetLibrary(Builtin::kMojoCoreLibrary);
   DART_CHECK_VALID(mojo_core_lib);
   Dart_Handle handle_watcher_type = Dart_GetType(
       mojo_core_lib,
       Dart_NewStringFromCString("MojoHandleWatcher"),
       0,
       nullptr);
   DART_CHECK_VALID(handle_watcher_type);
   result = Dart_Invoke(
       handle_watcher_type,
       Dart_NewStringFromCString("_start"),
@@ skipping 22 matching lines @@
   if (isolate == nullptr) {
     return false;
   }
 
   Dart_EnterIsolate(isolate);
   Dart_Handle result;
   Dart_EnterScope();
 
   // Load the root library into the builtin library so that main can be found.
   Dart_Handle builtin_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+      Builtin::GetLibrary(Builtin::kBuiltinLibrary);
   DART_CHECK_VALID(builtin_lib);
   Dart_Handle root_lib = Dart_RootLibrary();
   DART_CHECK_VALID(root_lib);
   result = Dart_LibraryImportLibrary(builtin_lib, root_lib, Dart_Null());
   DART_CHECK_VALID(result);
 
   if (config.compile_all) {
     result = Dart_CompileAll();
     DART_CHECK_VALID(result);
   }
@@ skipping 39 matching lines @@
 }
 
 void DartController::Shutdown() {
   CHECK(root_isolate_ != nullptr);
   Dart_EnterIsolate(root_isolate_);
   Dart_Handle result;
   Dart_EnterScope();
 
   // Stop the MojoHandleWatcher.
   Dart_Handle mojo_core_lib =
-      Builtin::LoadAndCheckLibrary(Builtin::kMojoCoreLibrary);
+      Builtin::GetLibrary(Builtin::kMojoCoreLibrary);
   DART_CHECK_VALID(mojo_core_lib);
   Dart_Handle handle_watcher_type = Dart_GetType(
       mojo_core_lib,
       Dart_NewStringFromCString("MojoHandleWatcher"),
       0,
       nullptr);
   DART_CHECK_VALID(handle_watcher_type);
   result = Dart_Invoke(
       handle_watcher_type,
       Dart_NewStringFromCString("_stop"),
       0,
       nullptr);
   DART_CHECK_VALID(result);
 
   result = Dart_RunLoop();
   DART_CHECK_VALID(result);
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
   Dart_Cleanup();
   root_isolate_ = nullptr;
   initialized_ = false;
 }
 
 }  // namespace apps
 }  // namespace mojo