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

vm/dart_api_impl.cc

Index: vm/dart_api_impl.cc
===================================================================
--- vm/dart_api_impl.cc	(revision 1771)
+++ vm/dart_api_impl.cc	(working copy)
@@ -465,7 +465,7 @@
 // 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);
 }
 
@@ -482,14 +482,14 @@
 
 
 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);