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

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

Issue 1698323004: Remove apparent duplicate call to PrepareForScriptLoading in Dartium (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, 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 "bin/vmservice_dartium.h" 5 #include "bin/vmservice_dartium.h"
6 6
7 #include "bin/builtin.h" 7 #include "bin/builtin.h"
8 #include "bin/dartutils.h" 8 #include "bin/dartutils.h"
9 #include "bin/eventhandler.h" 9 #include "bin/eventhandler.h"
10 #include "bin/platform.h" 10 #include "bin/platform.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 fprintf(stderr, "Dart_CreateIsolate failed: %s\n", error); 57 fprintf(stderr, "Dart_CreateIsolate failed: %s\n", error);
58 return 0; 58 return 0;
59 } 59 }
60 60
61 Dart_EnterScope(); 61 Dart_EnterScope();
62 Builtin::SetNativeResolver(Builtin::kBuiltinLibrary); 62 Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
63 Builtin::SetNativeResolver(Builtin::kIOLibrary); 63 Builtin::SetNativeResolver(Builtin::kIOLibrary);
64 64
65 Dart_Handle result; 65 Dart_Handle result;
66 66
67 // Prepare for script loading by setting up the 'print' and 'timer'
68 // closures and setting up 'package root' for URI resolution.
69 result = DartUtils::PrepareForScriptLoading(true, false);
70 CHECK_RESULT(result);
71
72 ASSERT(Dart_IsServiceIsolate(isolate)); 67 ASSERT(Dart_IsServiceIsolate(isolate));
73 if (!VmService::Setup(DEFAULT_VM_SERVICE_SERVER_IP, 68 if (!VmService::Setup(DEFAULT_VM_SERVICE_SERVER_IP,
74 DEFAULT_VM_SERVICE_SERVER_PORT, 69 DEFAULT_VM_SERVICE_SERVER_PORT,
75 false /* running_precompiled */)) { 70 false /* running_precompiled */)) {
76 fprintf(stderr, 71 fprintf(stderr,
77 "Vmservice::Setup failed: %s\n", VmService::GetErrorMessage()); 72 "Vmservice::Setup failed: %s\n", VmService::GetErrorMessage());
78 isolate = NULL; 73 isolate = NULL;
79 } 74 }
80 Dart_ExitScope(); 75 Dart_ExitScope();
81 Dart_ExitIsolate(); 76 Dart_ExitIsolate();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 151 }
157 152
158 /* DISALLOW_ALLOCATION */ 153 /* DISALLOW_ALLOCATION */
159 void VmServiceServer::operator delete(void* pointer) { 154 void VmServiceServer::operator delete(void* pointer) {
160 fprintf(stderr, "unreachable code\n"); 155 fprintf(stderr, "unreachable code\n");
161 abort(); 156 abort();
162 } 157 }
163 158
164 } // namespace bin 159 } // namespace bin
165 } // namespace dart 160 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698