@@ -167,7 +167,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
167
167
}
168
168
169
169
auto * isolate_data = static_cast <std::shared_ptr<DartIsolate>*>(
170
- Dart_IsolateData (dart_isolate));
170
+ Dart_IsolateGroupData (dart_isolate));
171
171
if (isolate_data->get () != this ) {
172
172
return false ;
173
173
}
@@ -178,7 +178,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
178
178
// We are entering a new scope (for the first time since initialization) and
179
179
// we want to restore the current scope to null when we exit out of this
180
180
// method. This balances the implicit Dart_EnterIsolate call made by
181
- // Dart_CreateIsolate (which calls the Initialize).
181
+ // Dart_CreateIsolateGroup (which calls the Initialize).
182
182
Dart_ExitIsolate ();
183
183
184
184
tonic::DartIsolateScope scope (isolate ());
@@ -641,8 +641,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
641
641
return service_isolate->isolate ();
642
642
}
643
643
644
- // |Dart_IsolateCreateCallback |
645
- Dart_Isolate DartIsolate::DartIsolateCreateCallback (
644
+ // |Dart_IsolateGroupCreateCallback |
645
+ Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback (
646
646
const char * advisory_script_uri,
647
647
const char * advisory_script_entrypoint,
648
648
const char * package_root,
@@ -726,14 +726,16 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
726
726
}
727
727
728
728
// Create the Dart VM isolate and give it the embedder object as the baton.
729
- Dart_Isolate isolate = Dart_CreateIsolate (
729
+ Dart_Isolate isolate = Dart_CreateIsolateGroup (
730
730
advisory_script_uri, //
731
731
advisory_script_entrypoint, //
732
732
(*embedder_isolate)->GetIsolateSnapshot ()->GetDataMapping (),
733
733
(*embedder_isolate)->GetIsolateSnapshot ()->GetInstructionsMapping (),
734
734
(*embedder_isolate)->GetSharedSnapshot ()->GetDataMapping (),
735
735
(*embedder_isolate)->GetSharedSnapshot ()->GetInstructionsMapping (), flags,
736
- embedder_isolate.get (), error);
736
+ embedder_isolate.get (), // isolate_group_data
737
+ embedder_isolate.get (), // isolate_group
738
+ error);
737
739
738
740
if (isolate == nullptr ) {
739
741
FML_DLOG (ERROR) << *error;
@@ -781,8 +783,8 @@ void DartIsolate::DartIsolateShutdownCallback(
781
783
isolate_group_data->get ()->OnShutdownCallback ();
782
784
}
783
785
784
- // |Dart_IsolateCleanupCallback |
785
- void DartIsolate::DartIsolateCleanupCallback (
786
+ // |Dart_IsolateGroupCleanupCallback |
787
+ void DartIsolate::DartIsolateGroupCleanupCallback (
786
788
std::shared_ptr<DartIsolate>* isolate_data) {
787
789
delete isolate_data;
788
790
}
0 commit comments