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

Unified Diff: bin/main.cc

Issue 9655015: - The dart:io library uses Uri from dart:uri. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 9 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
« bin/gen_snapshot.cc ('K') | « bin/io.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/main.cc
===================================================================
--- bin/main.cc (revision 5205)
+++ bin/main.cc (working copy)
@@ -391,11 +391,23 @@
// Prepare builtin and its dependent libraries for use to resolve URIs.
Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
+ if (Dart_IsError(uri_lib)) {
+ *error = strdup(Dart_GetError(uri_lib));
+ return false;
+ }
Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
- Dart_LibraryImportLibrary(builtin_lib, uri_lib);
+ if (Dart_IsError(builtin_lib)) {
+ *error = strdup(Dart_GetError(builtin_lib));
+ return false;
+ }
+ Dart_Handle library = Dart_LibraryImportLibrary(builtin_lib, uri_lib);
+ if (Dart_IsError(library)) {
+ *error = strdup(Dart_GetError(library));
+ return false;
+ }
// Load the specified application script into the newly created isolate.
- Dart_Handle library = LoadScript(builtin_lib, import_map_options);
+ library = LoadScript(builtin_lib, import_map_options);
if (Dart_IsError(library)) {
*error = strdup(Dart_GetError(library));
Dart_ExitScope();
« bin/gen_snapshot.cc ('K') | « bin/io.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698