Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Remove usage of Dart_AllocateWithNativeFields from tonic" #16684

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Revert "Remove usage of Dart_AllocateWithNativeFields from tonic" #16684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2049a88
Revert "Remove usage of Dart_AllocateWithNativeFields from tonic (#16…
dnfield Feb 19, 2020
232327d
Merge remote-tracking branch 'upstream/master' into revert-16588-remo…
dnfield Feb 19, 2020
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
6 changes: 0 additions & 6 deletions lib/ui/painting.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1890,12 +1890,6 @@ class Path extends NativeFieldWrapperClass2 {
/// Create a new empty [Path] object.
@pragma('vm:entry-point')
Path() { _constructor(); }

// Workaround for tonic, which expects classes with native fields to have a
// private constructor.
@pragma('vm:entry-point')
Path._() { _constructor(); }

void _constructor() native 'Path_constructor';

/// Creates a copy of another [Path].
Expand Down
14 changes: 5 additions & 9 deletions third_party/tonic/dart_wrappable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,13 @@ Dart_Handle DartWrappable::CreateDartWrapper(DartState* dart_state) {
Dart_PersistentHandle type = dart_state->class_library().GetClass(info);
TONIC_DCHECK(!LogIfError(type));

Dart_Handle private_constructor_name = Dart_NewStringFromCString("_");
Dart_Handle wrapper = Dart_New(type, private_constructor_name, 0, nullptr);
intptr_t native_fields[kNumberOfNativeFields];
native_fields[kPeerIndex] = reinterpret_cast<intptr_t>(this);
native_fields[kWrapperInfoIndex] = reinterpret_cast<intptr_t>(&info);
Dart_Handle wrapper =
Dart_AllocateWithNativeFields(type, kNumberOfNativeFields, native_fields);
TONIC_DCHECK(!LogIfError(wrapper));

Dart_Handle res = Dart_SetNativeInstanceField(
wrapper, kPeerIndex, reinterpret_cast<intptr_t>(this));
TONIC_DCHECK(!LogIfError(res));
res = Dart_SetNativeInstanceField(wrapper, kWrapperInfoIndex,
reinterpret_cast<intptr_t>(&info));
TONIC_DCHECK(!LogIfError(res));

this->RetainDartWrappableReference(); // Balanced in FinalizeDartWrapper.
dart_wrapper_ = Dart_NewWeakPersistentHandle(
wrapper, this, GetAllocationSize(), &FinalizeDartWrapper);
Expand Down