| Index: bin/builtin_nolib.cc
|
| ===================================================================
|
| --- bin/builtin_nolib.cc (revision 11998)
|
| +++ bin/builtin_nolib.cc (working copy)
|
| @@ -30,11 +30,14 @@
|
| }
|
|
|
|
|
| -void Builtin::SetupLibrary(Dart_Handle library, BuiltinLibraryId id) {
|
| +void Builtin::SetNativeResolver(BuiltinLibraryId id) {
|
| ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
|
| kInvalidLibrary);
|
| ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
|
| if (builtin_libraries_[id].has_natives_) {
|
| + Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_);
|
| + Dart_Handle library = Dart_LookupLibrary(url);
|
| + ASSERT(!Dart_IsError(library));
|
| // Setup the native resolver for built in library functions.
|
| DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
|
| }
|
| @@ -48,21 +51,13 @@
|
| Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_);
|
| Dart_Handle library = Dart_LookupLibrary(url);
|
| if (Dart_IsError(library)) {
|
| - ASSERT(id >= kCryptoLibrary && id < kInvalidLibrary);
|
| + ASSERT(id >= kWebLibrary && id < kInvalidLibrary);
|
| library = Dart_LoadLibrary(url, Source(id));
|
| - if (!Dart_IsError(library)) {
|
| - SetupLibrary(library, id);
|
| + if (!Dart_IsError(library) && (builtin_libraries_[id].has_natives_)) {
|
| + // Setup the native resolver for built in library functions.
|
| + DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
|
| }
|
| }
|
| DART_CHECK_VALID(library);
|
| return library;
|
| }
|
| -
|
| -
|
| -void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) {
|
| - Dart_Handle imported_library = LoadAndCheckLibrary(id);
|
| - // Import the library into current library.
|
| - DART_CHECK_VALID(Dart_LibraryImportLibrary(library,
|
| - imported_library,
|
| - Dart_Null()));
|
| -}
|
|
|