Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '57462f9ca52000932d2ac82613808131650b440c',
'dart_revision': 'df5036eb6e738c723339ed74c1e8ca93bea2570d',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 3cc623c46feb1a616e6dc27b9168581f
Signature: c0d0a2e1f16f13bfd61d0ffb9d142ca7

UNUSED LICENSES:

Expand Down
8 changes: 6 additions & 2 deletions third_party/tonic/dart_persistent_value.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ void DartPersistentValue::Clear() {
return;
}

DartIsolateScope scope(dart_state->isolate());
Dart_DeletePersistentHandle(value_);
if (Dart_CurrentIsolateGroup()) {
Dart_DeletePersistentHandle(value_);
} else {
DartIsolateScope scope(dart_state->isolate());
Dart_DeletePersistentHandle(value_);
}
dart_state_.reset();
value_ = nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion third_party/tonic/dart_wrappable.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void DartWrappable::ClearDartWrapper() {
TONIC_CHECK(!LogIfError(Dart_SetNativeInstanceField(wrapper, kPeerIndex, 0)));
TONIC_CHECK(
!LogIfError(Dart_SetNativeInstanceField(wrapper, kWrapperInfoIndex, 0)));
Dart_DeleteWeakPersistentHandle(Dart_CurrentIsolate(), dart_wrapper_);
Dart_DeleteWeakPersistentHandle(dart_wrapper_);
dart_wrapper_ = nullptr;
this->ReleaseDartWrappableReference();
}
Expand Down