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

vm/isolate.h

 // 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.
 
 #ifndef VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include <limits.h>
 
 #include "include/dart_api.h"
@@ skipping 168 matching lines @@
     return 0;
 #endif
   }
 
   void set_top_handle_scope(HandleScope* handle_scope) {
 #if defined(DEBUG)
     top_handle_scope_ = handle_scope;
 #endif
   }
 
-  void set_init_callback_data(void* value) {
-    init_callback_data_ = value;
-  }
-  void* init_callback_data() const {
-    return init_callback_data_;
-  }
-
   Dart_LibraryTagHandler library_tag_handler() const {
     return library_tag_handler_;
   }
   void set_library_tag_handler(Dart_LibraryTagHandler value) {
     library_tag_handler_ = value;
   }
 
-  static void SetInitCallback(Dart_IsolateInitCallback callback);
-  static Dart_IsolateInitCallback InitCallback();
+  static void SetCreateAndInitCallback(Dart_IsolateCreateAndInitCallback cback);
+  static Dart_IsolateCreateAndInitCallback CreateAndInitCallback();
 
   uword stack_limit_address() const {
     return reinterpret_cast<uword>(&stack_limit_);
   }
 
   void SetStackLimit(uword value);
   uword stack_limit() const { return stack_limit_; }
 
   void SetStackLimitFromCurrentTOS(uword isolate_stack_top);
 
@@ skipping 32 matching lines @@
   RawContext* top_context_;
   Zone* current_zone_;
 #if defined(DEBUG)
   int32_t no_gc_scope_depth_;
   int32_t no_handle_scope_depth_;
   HandleScope* top_handle_scope_;
 #endif
   int32_t random_seed_;
   BigintStore* bigint_store_;
   uword top_exit_frame_info_;
-  void* init_callback_data_;
   Dart_LibraryTagHandler library_tag_handler_;
   ApiState* api_state_;
   StubCode* stub_code_;
   CodeIndexTable* code_index_table_;
   LongJump* long_jump_base_;
   TimerList timer_list_;
   uword stack_limit_;
   uword stack_limit_on_overflow_exception_;
   intptr_t ast_node_id_;
 
-  static Dart_IsolateInitCallback init_callback_;
+  static Dart_IsolateCreateAndInitCallback create_init_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Isolate);
 };
 
 }  // namespace dart
 
 #if defined(TARGET_OS_LINUX)
 #include "vm/isolate_linux.h"
 #elif defined(TARGET_OS_MACOS)
 #include "vm/isolate_macos.h"
 #elif defined(TARGET_OS_WINDOWS)
 #include "vm/isolate_win.h"
 #else
 #error Unknown target os.
 #endif
 
 #endif  // VM_ISOLATE_H_