| Index: sky/engine/core/script/dart_controller.cc
|
| diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc
|
| index b440d420dd189d7a0b181b334a1b4b7520447089..b51e1ba85f68923dd1d67bcbd308388938614132 100644
|
| --- a/sky/engine/core/script/dart_controller.cc
|
| +++ b/sky/engine/core/script/dart_controller.cc
|
| @@ -199,8 +199,8 @@ static Dart_Isolate IsolateCreateCallback(const char* script_uri,
|
|
|
| {
|
| DartApiScope apiScope;
|
| - Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
|
| - Builtin::SetNativeResolver(Builtin::kMojoCoreLibrary);
|
| + Builtin::PrepareLibrary(Builtin::kBuiltinLibrary);
|
| + Builtin::PrepareLibrary(Builtin::kMojoCoreLibrary);
|
| }
|
|
|
| Dart_ExitIsolate();
|
| @@ -231,8 +231,7 @@ static void EnsureHandleWatcherStarted() {
|
|
|
| // TODO(dart): Call Dart_Cleanup (ensure the handle watcher isolate is closed)
|
| // during shutdown.
|
| - Dart_Handle mojo_core_lib =
|
| - Builtin::LoadAndCheckLibrary(Builtin::kMojoCoreLibrary);
|
| + Dart_Handle mojo_core_lib = Builtin::GetLibrary(Builtin::kMojoCoreLibrary);
|
| CHECK(!LogIfError((mojo_core_lib)));
|
| Dart_Handle handle_watcher_type = Dart_GetType(
|
| mojo_core_lib,
|
| @@ -268,8 +267,8 @@ void DartController::CreateIsolateFor(Document* document) {
|
| {
|
| DartApiScope apiScope;
|
|
|
| - Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
|
| - Builtin::SetNativeResolver(Builtin::kMojoCoreLibrary);
|
| + Builtin::PrepareLibrary(Builtin::kBuiltinLibrary);
|
| + Builtin::PrepareLibrary(Builtin::kMojoCoreLibrary);
|
| BuiltinNatives::Init();
|
|
|
| builtin_sky_ = adoptPtr(new BuiltinSky(dart_state()));
|
|
|