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 @@ -35,7 +35,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': '72c1995001d1214138a8186032f2199f237bc505',
'dart_revision': 'd6e7aacfe6d19c8d478dcf3e315b76720813a417',

# 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: 37e8574abeb6fbc0daec535681619bdf
Signature: 56dff2126686e1d0cc09e0792dce6a2a

UNUSED LICENSES:

Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/canvaskit/path.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CkPath extends ManagedSkiaObject<SkPath> implements ui.Path {

CkPath.from(CkPath other)
: _fillType = other.fillType,
super(SkPath(other.skiaObject)) {
super(other.skiaObject.copy()) {
skiaObject.setFillType(toSkFillType(_fillType));
}

Expand Down
19 changes: 19 additions & 0 deletions lib/web_ui/test/canvaskit/path_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,25 @@ void testMain() {
expect(measure1.contourIndex, 1);
expect(measure1.extractPath(0, 15).getBounds(), ui.Rect.fromLTRB(20, 20, 30, 25));
});

test('Path.from', () {
final ui.Rect rect1 = ui.Rect.fromLTRB(0, 0, 10, 10);
final ui.Rect rect2 = ui.Rect.fromLTRB(10, 10, 20, 20);

final ui.Path original = ui.Path();
original.addRect(rect1);
expect(original, isA<CkPath>());
expect(original.getBounds(), rect1);

final ui.Path copy = ui.Path.from(original);
expect(copy, isA<CkPath>());
expect(copy.getBounds(), rect1);

// Test that when copy is mutated, the original is not affected
copy.addRect(rect2);
expect(original.getBounds(), rect1);
expect(copy.getBounds(), rect1.expandToInclude(rect2));
});
},
skip:
isIosSafari); // TODO: https://github.com/flutter/flutter/issues/60040
Expand Down
8 changes: 0 additions & 8 deletions shell/common/thread_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,4 @@ ThreadHost::ThreadHost(std::string name_prefix_arg, uint64_t mask)

ThreadHost::~ThreadHost() = default;

void ThreadHost::Reset() {
platform_thread.reset();
ui_thread.reset();
raster_thread.reset();
io_thread.reset();
profiler_thread.reset();
}

} // namespace flutter
2 changes: 0 additions & 2 deletions shell/common/thread_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ struct ThreadHost {
ThreadHost(std::string name_prefix, uint64_t type_mask);

~ThreadHost();

void Reset();
};

} // namespace flutter
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/android_shell_holder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ AndroidShellHolder::AndroidShellHolder(

AndroidShellHolder::~AndroidShellHolder() {
shell_.reset();
thread_host_->Reset();
thread_host_.reset();
}

bool AndroidShellHolder::IsValid() const {
Expand Down