- Refactor the isolate callback mechanism to also include creation of the

vm/dart_api_impl.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 447 matching lines @@
   return NULL;
 }
 
 
 // --- Initialization and Globals ---
 
 
 // TODO(iposva): This is a placeholder for the eventual external Dart API.
 DART_EXPORT bool Dart_Initialize(int argc,
                                  const char** argv,
-                                 Dart_IsolateInitCallback callback) {
+                                 Dart_IsolateCreateAndInitCallback callback) {
   return Dart::InitOnce(argc, argv, callback);
 }
 
 
 DART_EXPORT bool Dart_IsVMFlagSet(const char* flag_name) {
   if (Flags::Lookup(flag_name) != NULL) {
     return true;
   }
   return false;
 }
 
 
 // --- Isolates ---
 
 
 DART_EXPORT Dart_Isolate Dart_CreateIsolate(const Dart_Snapshot* snapshot,
-                                            void* data) {
+                                            void* callback_data) {
   Isolate* isolate = Dart::CreateIsolate();
   ASSERT(isolate != NULL);
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
-    Dart::InitializeIsolate(snapshot, data);
+    Dart::InitializeIsolate(snapshot, callback_data);
     START_TIMER(time_total_runtime);
     isolate->set_long_jump_base(base);
     return reinterpret_cast<Dart_Isolate>(isolate);
   } else {
     {
       DARTSCOPE(isolate);
       const String& error =
           String::Handle(isolate->object_store()->sticky_error());
       // TODO(asiva): Need to return this as a error.
       OS::PrintErr(error.ToCString());
@@ skipping 1792 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart