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

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

Issue 12320072: Revert "Revert "Use browsers JSON.parse for parsing JSON (#3)"" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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.cc ('k') | runtime/vm/vm.gypi » ('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/object.h" 5 #include "vm/object.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/assert.h" 8 #include "platform/assert.h"
9 #include "vm/assembler.h" 9 #include "vm/assembler.h"
10 #include "vm/bigint_operations.h" 10 #include "vm/bigint_operations.h"
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 if (!error.IsNull()) { 1094 if (!error.IsNull()) {
1095 return error.raw(); 1095 return error.raw();
1096 } 1096 }
1097 Library& lib = Library::Handle(); 1097 Library& lib = Library::Handle();
1098 INIT_LIBRARY(Crypto, 1098 INIT_LIBRARY(Crypto,
1099 Bootstrap::LoadCryptoScript(false), 1099 Bootstrap::LoadCryptoScript(false),
1100 Library::CryptoLibrary()); 1100 Library::CryptoLibrary());
1101 INIT_LIBRARY(Json, 1101 INIT_LIBRARY(Json,
1102 Bootstrap::LoadJsonScript(false), 1102 Bootstrap::LoadJsonScript(false),
1103 Library::JsonLibrary()); 1103 Library::JsonLibrary());
1104 patch_script = Bootstrap::LoadJsonScript(true);
1105 error = lib.Patch(patch_script);
1106 if (!error.IsNull()) {
1107 return error.raw();
1108 }
1104 INIT_LIBRARY(Utf, 1109 INIT_LIBRARY(Utf,
1105 Bootstrap::LoadUtfScript(false), 1110 Bootstrap::LoadUtfScript(false),
1106 Library::UtfLibrary()); 1111 Library::UtfLibrary());
1107 INIT_LIBRARY(Uri, 1112 INIT_LIBRARY(Uri,
1108 Bootstrap::LoadUriScript(false), 1113 Bootstrap::LoadUriScript(false),
1109 Library::UriLibrary()); 1114 Library::UriLibrary());
1110 Bootstrap::SetupNativeResolver(); 1115 Bootstrap::SetupNativeResolver();
1111 1116
1112 // Remove the Object superclass cycle by setting the super type to null (not 1117 // Remove the Object superclass cycle by setting the super type to null (not
1113 // to the type of null). 1118 // to the type of null).
(...skipping 11901 matching lines...) Expand 10 before | Expand all | Expand 10 after
13015 } 13020 }
13016 return result.raw(); 13021 return result.raw();
13017 } 13022 }
13018 13023
13019 13024
13020 const char* WeakProperty::ToCString() const { 13025 const char* WeakProperty::ToCString() const {
13021 return "_WeakProperty"; 13026 return "_WeakProperty";
13022 } 13027 }
13023 13028
13024 } // namespace dart 13029 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/bootstrap.cc ('k') | runtime/vm/vm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698