Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: runtime/bin/main.cc

Issue 10905102: Rename Builtin::LoadLibrary to Builtin::LoadAndCheckLibrary as the name (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/gen_snapshot.cc ('k') | runtime/vm/unit_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
===================================================================
--- runtime/bin/main.cc (revision 11874)
+++ runtime/bin/main.cc (working copy)
@@ -384,9 +384,10 @@
if (snapshot_buffer != NULL) {
// Setup the native resolver as the snapshot does not carry it.
- Builtin::SetupLibrary(Builtin::LoadLibrary(Builtin::kBuiltinLibrary),
- Builtin::kBuiltinLibrary);
- Builtin::SetupLibrary(Builtin::LoadLibrary(Builtin::kIOLibrary),
+ Builtin::SetupLibrary(
+ Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary),
+ Builtin::kBuiltinLibrary);
+ Builtin::SetupLibrary(Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary),
Builtin::kIOLibrary);
}
@@ -417,7 +418,8 @@
}
// Prepare for script loading by setting up the 'print' and 'timer'
// closures and setting up 'package root' for URI resolution.
- Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
+ Dart_Handle builtin_lib =
+ Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
DartUtils::PrepareForScriptLoading(package_root, builtin_lib);
snapshot_file->ReadFully(buffer, len);
@@ -428,9 +430,10 @@
use_script_snapshot = false; // No further usage of script snapshots.
} else {
// Prepare builtin and its dependent libraries for use to resolve URIs.
- Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
+ Dart_Handle uri_lib = Builtin::LoadAndCheckLibrary(Builtin::kUriLibrary);
CHECK_RESULT(uri_lib);
- Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
+ Dart_Handle builtin_lib =
+ Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
CHECK_RESULT(builtin_lib);
// Prepare for script loading by setting up the 'print' and 'timer'
« no previous file with comments | « runtime/bin/gen_snapshot.cc ('k') | runtime/vm/unit_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698