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

Unified Diff: runtime/bin/main.cc

Issue 914253006: Initialize standalone embedder debugger before calling Dart_Initialize (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index b2723ca147a55f918d6c24ea190b0cdb6b7330f6..693ab902d30f28f5c8107e305b8cc49606ecf3a3 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -947,20 +947,6 @@ void main(int argc, char** argv) {
// Start event handler.
EventHandler::Start();
- // Initialize the Dart VM.
- if (!Dart_Initialize(CreateIsolateAndSetup, NULL, NULL, ShutdownIsolate,
- DartUtils::OpenFile,
- DartUtils::ReadFile,
- DartUtils::WriteFile,
- DartUtils::CloseFile,
- DartUtils::EntropySource)) {
- fprintf(stderr, "%s", "VM initialization failed\n");
- fflush(stderr);
- exit(kErrorExitCode);
- }
-
-
-
// Start the debugger wire protocol handler if necessary.
if (start_debugger) {
ASSERT(debug_port >= 0);
@@ -973,6 +959,18 @@ void main(int argc, char** argv) {
DebuggerConnectionHandler::InitForVmService();
}
+ // Initialize the Dart VM.
+ if (!Dart_Initialize(CreateIsolateAndSetup, NULL, NULL, ShutdownIsolate,
+ DartUtils::OpenFile,
+ DartUtils::ReadFile,
+ DartUtils::WriteFile,
+ DartUtils::CloseFile,
+ DartUtils::EntropySource)) {
+ fprintf(stderr, "%s", "VM initialization failed\n");
+ fflush(stderr);
+ exit(kErrorExitCode);
+ }
+
Dart_RegisterIsolateServiceRequestCallback(
"io", &ServiceRequestHandler, NULL);
« 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