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

Side by Side Diff: runtime/bin/builtin.cc

Issue 11337019: Use patching for dart:io. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments Created 8 years, 1 month 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
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 <stdio.h> 5 #include <stdio.h>
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "bin/builtin.h" 9 #include "bin/builtin.h"
10 #include "bin/dartutils.h" 10 #include "bin/dartutils.h"
11 11
12 12
13 Builtin::builtin_lib_props Builtin::builtin_libraries_[] = { 13 Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {
14 /* url_ source_ has_natives_ */ 14 /* { url_, source_, patch_url_, patch_source_, has_natives_ } */
15 { DartUtils::kBuiltinLibURL, builtin_source_, true }, 15 { DartUtils::kBuiltinLibURL, builtin_source_, NULL, NULL, true },
16 { DartUtils::kJsonLibURL, json_source_, false }, 16 { DartUtils::kJsonLibURL, json_source_, NULL, NULL, false },
17 { DartUtils::kUriLibURL, uri_source_, false }, 17 { DartUtils::kUriLibURL, uri_source_, NULL, NULL, false },
18 { DartUtils::kCryptoLibURL, crypto_source_, false }, 18 { DartUtils::kCryptoLibURL, crypto_source_, NULL, NULL, false },
19 { DartUtils::kIOLibURL, io_source_, true }, 19 { DartUtils::kIOLibURL, io_source_,
20 { DartUtils::kUtfLibURL, utf_source_, false } 20 DartUtils::kIOLibPatchURL, io_patch_, true },
21 { DartUtils::kUtfLibURL, utf_source_, NULL, NULL, false }
21 }; 22 };
22 23
23 24
24 Dart_Handle Builtin::Source(BuiltinLibraryId id) { 25 Dart_Handle Builtin::Source(BuiltinLibraryId id) {
25 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 26 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
26 kInvalidLibrary); 27 kInvalidLibrary);
27 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 28 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
28 return Dart_NewString(builtin_libraries_[id].source_); 29 return Dart_NewString(builtin_libraries_[id].source_);
29 } 30 }
30 31
31 32
32 void Builtin::SetNativeResolver(BuiltinLibraryId id) { 33 void Builtin::SetNativeResolver(BuiltinLibraryId id) {
33 UNREACHABLE(); 34 UNREACHABLE();
34 } 35 }
35 36
36 37
37 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) { 38 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
38 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 39 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
39 kInvalidLibrary); 40 kInvalidLibrary);
40 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 41 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
41 Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_); 42 Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_);
42 Dart_Handle library = Dart_LookupLibrary(url); 43 Dart_Handle library = Dart_LookupLibrary(url);
43 if (Dart_IsError(library)) { 44 if (Dart_IsError(library)) {
44 library = Dart_LoadLibrary(url, Source(id)); 45 library = Dart_LoadLibrary(url, Source(id));
45 if (!Dart_IsError(library) && (builtin_libraries_[id].has_natives_)) { 46 if (!Dart_IsError(library) && (builtin_libraries_[id].has_natives_)) {
46 // Setup the native resolver for built in library functions. 47 // Setup the native resolver for built in library functions.
47 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup)); 48 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
48 } 49 }
50 if (builtin_libraries_[id].patch_url_ != NULL) {
51 ASSERT(builtin_libraries_[id].patch_source_ != NULL);
52 Dart_Handle patch_url = Dart_NewString(builtin_libraries_[id].patch_url_);
53 Dart_Handle patch_source =
54 Dart_NewString(builtin_libraries_[id].patch_source_);
55 DART_CHECK_VALID(Dart_LoadPatch(library, patch_url, patch_source));
56 }
49 } 57 }
50 DART_CHECK_VALID(library); 58 DART_CHECK_VALID(library);
51 return library; 59 return library;
52 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698