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

Side by Side Diff: runtime/vm/bootstrap.cc

Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Final cleanup Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/vm/bootstrap.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/bootstrap.h" 5 #include "vm/bootstrap.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "vm/bootstrap_natives.h" 9 #include "vm/bootstrap_natives.h"
10 #include "vm/compiler.h" 10 #include "vm/compiler.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 Bootstrap::mirrors_source_paths_, 67 Bootstrap::mirrors_source_paths_,
68 Bootstrap::mirrors_patch_paths_), 68 Bootstrap::mirrors_patch_paths_),
69 INIT_LIBRARY(ObjectStore::kTypedData, 69 INIT_LIBRARY(ObjectStore::kTypedData,
70 typed_data, 70 typed_data,
71 Bootstrap::typed_data_source_paths_, 71 Bootstrap::typed_data_source_paths_,
72 Bootstrap::typed_data_patch_paths_), 72 Bootstrap::typed_data_patch_paths_),
73 INIT_LIBRARY(ObjectStore::kUtf, 73 INIT_LIBRARY(ObjectStore::kUtf,
74 utf, 74 utf,
75 Bootstrap::utf_source_paths_, 75 Bootstrap::utf_source_paths_,
76 NULL), 76 NULL),
77 INIT_LIBRARY(ObjectStore::kUri,
78 uri,
79 Bootstrap::uri_source_paths_,
80 NULL),
81 77
82 { ObjectStore::kNone, NULL, NULL, NULL, NULL } 78 { ObjectStore::kNone, NULL, NULL, NULL, NULL }
83 }; 79 };
84 80
85 81
86 static RawString* GetLibrarySource(const Library& lib, 82 static RawString* GetLibrarySource(const Library& lib,
87 const String& uri, 83 const String& uri,
88 bool patch) { 84 bool patch) {
89 // First check if this is a valid boot strap library and find it's index 85 // First check if this is a valid boot strap library and find it's index
90 // in the 'bootstrap_libraries' table above. 86 // in the 'bootstrap_libraries' table above.
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 // Exit the Dart scope. 320 // Exit the Dart scope.
325 Dart_ExitScope(); 321 Dart_ExitScope();
326 322
327 // Restore the library tag handler for the isolate. 323 // Restore the library tag handler for the isolate.
328 isolate->set_library_tag_handler(saved_tag_handler); 324 isolate->set_library_tag_handler(saved_tag_handler);
329 325
330 return error.raw(); 326 return error.raw();
331 } 327 }
332 328
333 } // namespace dart 329 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/bootstrap.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698