Index: runtime/bin/builtin.cc |
diff --git a/runtime/bin/builtin.cc b/runtime/bin/builtin.cc |
index b3215bbfb8f3d0f6aeddcd83f02485da8eeff378..49ebb05a50b96f71276d2d921ea2508a667fc214 100644 |
--- a/runtime/bin/builtin.cc |
+++ b/runtime/bin/builtin.cc |
@@ -14,30 +14,29 @@ namespace dart { |
namespace bin { |
Builtin::builtin_lib_props Builtin::builtin_libraries_[] = { |
- /* { url_, source_, patch_url_, patch_source_, has_natives_ } */ |
- { DartUtils::kBuiltinLibURL, _builtin_source_paths_, NULL, NULL, true }, |
- { DartUtils::kIOLibURL, io_source_paths_, |
- DartUtils::kIOLibPatchURL, io_patch_paths_, true }, |
+ /* { url_, source_, patch_url_, patch_source_, has_natives_ } */ |
+ {DartUtils::kBuiltinLibURL, _builtin_source_paths_, NULL, NULL, true}, |
+ {DartUtils::kIOLibURL, io_source_paths_, DartUtils::kIOLibPatchURL, |
+ io_patch_paths_, true}, |
#if defined(DART_NO_SNAPSHOT) |
- // Only include these libraries in the dart_bootstrap case for now. |
- { "dart:html", html_source_paths_, NULL, NULL, true }, |
- { "dart:html_common", html_common_source_paths_, NULL, NULL, true}, |
- { "dart:js", js_source_paths_, NULL, NULL, true}, |
- { "dart:js_util", js_util_source_paths_, NULL, NULL, true}, |
- { "dart:_blink", _blink_source_paths_, NULL, NULL, true }, |
- { "dart:indexed_db", indexed_db_source_paths_, NULL, NULL, true }, |
- { "cached_patches.dart", cached_patches_source_paths_, NULL, NULL, true }, |
- { "dart:web_gl", web_gl_source_paths_, NULL, NULL, true }, |
- { "metadata.dart", metadata_source_paths_, NULL, NULL, true }, |
- { "dart:web_sql", web_sql_source_paths_, NULL, NULL, true }, |
- { "dart:svg", svg_source_paths_, NULL, NULL, true }, |
- { "dart:web_audio", web_audio_source_paths_, NULL, NULL, true }, |
+ // Only include these libraries in the dart_bootstrap case for now. |
+ {"dart:html", html_source_paths_, NULL, NULL, true}, |
+ {"dart:html_common", html_common_source_paths_, NULL, NULL, true}, |
+ {"dart:js", js_source_paths_, NULL, NULL, true}, |
+ {"dart:js_util", js_util_source_paths_, NULL, NULL, true}, |
+ {"dart:_blink", _blink_source_paths_, NULL, NULL, true}, |
+ {"dart:indexed_db", indexed_db_source_paths_, NULL, NULL, true}, |
+ {"cached_patches.dart", cached_patches_source_paths_, NULL, NULL, true}, |
+ {"dart:web_gl", web_gl_source_paths_, NULL, NULL, true}, |
+ {"metadata.dart", metadata_source_paths_, NULL, NULL, true}, |
+ {"dart:web_sql", web_sql_source_paths_, NULL, NULL, true}, |
+ {"dart:svg", svg_source_paths_, NULL, NULL, true}, |
+ {"dart:web_audio", web_audio_source_paths_, NULL, NULL, true}, |
#endif // defined(DART_NO_SNAPSHOT) |
- // End marker. |
- { NULL, NULL, NULL, NULL, false } |
-}; |
+ // End marker. |
+ {NULL, NULL, NULL, NULL, false}}; |
Dart_Port Builtin::load_port_ = ILLEGAL_PORT; |
const int Builtin::num_libs_ = |
@@ -100,8 +99,8 @@ Dart_Handle Builtin::GetSource(const char** source_paths, const char* uri) { |
if (!Dart_IsString(src)) { |
// In case reading the file caused an error, use the sources directly. |
const char* source = source_paths[i + 2]; |
- src = Dart_NewStringFromUTF8( |
- reinterpret_cast<const uint8_t*>(source), strlen(source)); |
+ src = Dart_NewStringFromUTF8(reinterpret_cast<const uint8_t*>(source), |
+ strlen(source)); |
} |
return src; |
} |
@@ -127,8 +126,7 @@ Dart_Handle Builtin::LoadLibrary(Dart_Handle url, BuiltinLibraryId id) { |
} |
if (builtin_libraries_[id].patch_url_ != NULL) { |
ASSERT(builtin_libraries_[id].patch_paths_ != NULL); |
- LoadPatchFiles(library, |
- builtin_libraries_[id].patch_url_, |
+ LoadPatchFiles(library, builtin_libraries_[id].patch_url_, |
builtin_libraries_[id].patch_paths_); |
} |
return library; |