diff --git a/DEPS b/DEPS index 88a60cfbf8ce6..eddb798600419 100644 --- a/DEPS +++ b/DEPS @@ -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 diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 23c83b952dc9a..54ef3f16ebaf6 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 37e8574abeb6fbc0daec535681619bdf +Signature: 56dff2126686e1d0cc09e0792dce6a2a UNUSED LICENSES: diff --git a/lib/web_ui/lib/src/engine/canvaskit/path.dart b/lib/web_ui/lib/src/engine/canvaskit/path.dart index e8518dc6e6828..d2d1a333d92ee 100644 --- a/lib/web_ui/lib/src/engine/canvaskit/path.dart +++ b/lib/web_ui/lib/src/engine/canvaskit/path.dart @@ -13,7 +13,7 @@ class CkPath extends ManagedSkiaObject implements ui.Path { CkPath.from(CkPath other) : _fillType = other.fillType, - super(SkPath(other.skiaObject)) { + super(other.skiaObject.copy()) { skiaObject.setFillType(toSkFillType(_fillType)); } diff --git a/lib/web_ui/test/canvaskit/path_test.dart b/lib/web_ui/test/canvaskit/path_test.dart index 151323f5303eb..5c5072ce0c8ae 100644 --- a/lib/web_ui/test/canvaskit/path_test.dart +++ b/lib/web_ui/test/canvaskit/path_test.dart @@ -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()); + expect(original.getBounds(), rect1); + + final ui.Path copy = ui.Path.from(original); + expect(copy, isA()); + 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 diff --git a/shell/common/thread_host.cc b/shell/common/thread_host.cc index fdae202a53cce..2e0d539fa82f0 100644 --- a/shell/common/thread_host.cc +++ b/shell/common/thread_host.cc @@ -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 diff --git a/shell/common/thread_host.h b/shell/common/thread_host.h index c5db31938563e..d944963282cb9 100644 --- a/shell/common/thread_host.h +++ b/shell/common/thread_host.h @@ -38,8 +38,6 @@ struct ThreadHost { ThreadHost(std::string name_prefix, uint64_t type_mask); ~ThreadHost(); - - void Reset(); }; } // namespace flutter diff --git a/shell/platform/android/android_shell_holder.cc b/shell/platform/android/android_shell_holder.cc index e83980f4bf4f5..f72e4edf77faf 100644 --- a/shell/platform/android/android_shell_holder.cc +++ b/shell/platform/android/android_shell_holder.cc @@ -157,7 +157,7 @@ AndroidShellHolder::AndroidShellHolder( AndroidShellHolder::~AndroidShellHolder() { shell_.reset(); - thread_host_->Reset(); + thread_host_.reset(); } bool AndroidShellHolder::IsValid() const {