From fe3e93e19151154c4684b51c43c2ca29d0751d7a Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 26 Dec 2022 13:56:10 -0500 Subject: [PATCH 01/28] eb8e52c59 Roll Fuchsia Mac SDK from QOdpfMkM_LcPon_zm... to ozbhYRHpQKfnPwJdh... (flutter/engine#38505) (#117658) --- bin/internal/engine.version | 2 +- bin/internal/fuchsia-mac.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 515b6817eba0f..c00742f36538a 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -da181dfbfb27cef0a557b9a4332b3121bff252c6 +eb8e52c59d7fa24ed3f02e271dd45e6e54c7115f diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version index 2b8d3d6b386f1..10d69dad55394 100644 --- a/bin/internal/fuchsia-mac.version +++ b/bin/internal/fuchsia-mac.version @@ -1 +1 @@ -QOdpfMkM_LcPon_zm8VQBU8b5-GAXzpED_jneh5Tn7oC +ozbhYRHpQKfnPwJdhvHFrwU_GXUu1l1cGgvmfDTfKoAC From 41d191187dfef642db96985abcf59619480217c5 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Mon, 26 Dec 2022 15:27:36 -0500 Subject: [PATCH 02/28] becee173e Roll Skia from 7442335dce20 to eeec7a127312 (1 revision) (flutter/engine#38506) (#117662) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index c00742f36538a..e7bc48ae4e0f3 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -eb8e52c59d7fa24ed3f02e271dd45e6e54c7115f +becee173eac04ed0615254b69283f3d1f2571333 From d15db15184e6644809c9dededfce00d0db5cd887 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 00:28:08 -0500 Subject: [PATCH 03/28] 84043c672 Roll Skia from eeec7a127312 to 7fe57dac0702 (1 revision) (flutter/engine#38508) (#117665) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index e7bc48ae4e0f3..396a456d5c1de 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -becee173eac04ed0615254b69283f3d1f2571333 +84043c6724aae87a2d5c84a96eec08b446f38926 From 4cce45f60b3dc3c7998b69fa0b3abb684a87a698 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 01:14:24 -0500 Subject: [PATCH 04/28] 06b2eff9d Roll Dart SDK from 6340d946feac to 494e4d4bf58d (1 revision) (flutter/engine#38509) (#117667) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 396a456d5c1de..dd3c6a6636fb0 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -84043c6724aae87a2d5c84a96eec08b446f38926 +06b2eff9dba1959e881e1c9af3e15fc45263e787 From d947687498be8c73b0c00107ee7d2189c7a08381 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 02:16:24 -0500 Subject: [PATCH 05/28] 893e48763 Roll Skia from 7fe57dac0702 to 8099f53e7a43 (1 revision) (flutter/engine#38510) (#117668) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index dd3c6a6636fb0..2c721cbae7790 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -06b2eff9dba1959e881e1c9af3e15fc45263e787 +893e48763fc9def0a83e3fbf551bab7ede03d381 From a7cc010a9d0a692e08ec8dbf363b0aab2dcb1619 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 03:03:36 -0500 Subject: [PATCH 06/28] dbb5a5739 Roll Fuchsia Mac SDK from ozbhYRHpQKfnPwJdh... to HHADjSDGmZSkODScd... (flutter/engine#38511) (#117669) --- bin/internal/engine.version | 2 +- bin/internal/fuchsia-mac.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 2c721cbae7790..e45708d20fcfa 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -893e48763fc9def0a83e3fbf551bab7ede03d381 +dbb5a57391e176d61cd4c58e7eaaf7b3bfedf9db diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version index 10d69dad55394..7ce9cb35fa9cd 100644 --- a/bin/internal/fuchsia-mac.version +++ b/bin/internal/fuchsia-mac.version @@ -1 +1 @@ -ozbhYRHpQKfnPwJdhvHFrwU_GXUu1l1cGgvmfDTfKoAC +HHADjSDGmZSkODScd5stNi2tBI6O98wrD_smfIz71jsC From c3f0c13085919b4d0d790b77f3744cc537446a1a Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 03:50:24 -0500 Subject: [PATCH 07/28] dcde1faa8 Roll Skia from 8099f53e7a43 to 789552988917 (1 revision) (flutter/engine#38512) (#117672) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index e45708d20fcfa..a149d23c8504a 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -dbb5a57391e176d61cd4c58e7eaaf7b3bfedf9db +dcde1faa8129ebd1da8fe6ba571678d8421cda6f From 91c3f80c8c4ec00a94dde90adc71d7236092f56a Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 04:44:24 -0500 Subject: [PATCH 08/28] 790604a09 Roll Skia from 789552988917 to 6abfcf819da1 (2 revisions) (flutter/engine#38513) (#117674) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index a149d23c8504a..701ba2fc4d20c 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -dcde1faa8129ebd1da8fe6ba571678d8421cda6f +790604a09f9934a01058f44b0f5a62e421175a21 From bf2701d2a8cc528b73003df1ea598046cf6c6599 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 09:54:34 -0500 Subject: [PATCH 09/28] 9d69a91bb Roll Dart SDK from 494e4d4bf58d to 742e1dc3e17f (1 revision) (flutter/engine#38514) (#117681) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 701ba2fc4d20c..99365024e71fb 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -790604a09f9934a01058f44b0f5a62e421175a21 +9d69a91bba58c1e13d055ae45166e38a1a997ce7 From 00e9cf1d65e35886e95ba50719026f44bea873de Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 11:29:47 -0500 Subject: [PATCH 10/28] e11cb245b Roll Flutter from e766ad07e600 to ae292cc4e5e4 (6 revisions) (flutter/plugins#6885) (#117682) --- bin/internal/flutter_plugins.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/flutter_plugins.version b/bin/internal/flutter_plugins.version index bf7a437cd645f..088ecb4e77656 100644 --- a/bin/internal/flutter_plugins.version +++ b/bin/internal/flutter_plugins.version @@ -1 +1 @@ -3eba2bf698e568a167b13cfa356a5947dae23d1e +e11cb245bb8ec13d36798cc7278c109af7144be8 From 5538fa1360edf583b6777696fc970e93a1719484 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 11:33:21 -0500 Subject: [PATCH 11/28] c54228b5c Roll Skia from 6abfcf819da1 to 4f64211cd741 (1 revision) (flutter/engine#38515) (#117684) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 99365024e71fb..9dcef898d7d86 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -9d69a91bba58c1e13d055ae45166e38a1a997ce7 +c54228b5c97463331cd227ad92cffe96522af72a From 1c273fbe8ade8808b94b34535e757310684fcbe6 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 13:41:24 -0500 Subject: [PATCH 12/28] 27ebaec7d Roll Skia from 4f64211cd741 to 3939e68c4b4d (2 revisions) (flutter/engine#38517) (#117686) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 9dcef898d7d86..2b83c9a51f9e8 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -c54228b5c97463331cd227ad92cffe96522af72a +27ebaec7d29d3910dd5e6687c70dfefc001bdfe6 From f11fbbafca425706f811e730c581eb0a3a723823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Sharma?= <737941+loic-sharma@users.noreply.github.com> Date: Tue, 27 Dec 2022 11:16:19 -0800 Subject: [PATCH 13/28] [macOS] Fix the `run_debug_test_macos` on arm64 (#117250) * [macOS] Fix the run_debug_test_macos on arm64 * DO NOT MERGE - Test in presubmit * Revert "DO NOT MERGE - Test in presubmit" This reverts commit c83dc2847065433ea0eae9573844401b88f909fa. --- examples/hello_world/macos/Runner/DebugProfile.entitlements | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/hello_world/macos/Runner/DebugProfile.entitlements b/examples/hello_world/macos/Runner/DebugProfile.entitlements index dddb8a30c851e..4eac53fe0f732 100644 --- a/examples/hello_world/macos/Runner/DebugProfile.entitlements +++ b/examples/hello_world/macos/Runner/DebugProfile.entitlements @@ -2,8 +2,6 @@ - com.apple.security.app-sandbox - com.apple.security.cs.allow-jit com.apple.security.network.server From d7abc0bbd0cfc3e9e294430a366d49df796869a9 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 14:47:20 -0500 Subject: [PATCH 14/28] a53f1e983 Roll Skia from 3939e68c4b4d to 2b6d44eb650b (2 revisions) (flutter/engine#38519) (#117689) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 2b83c9a51f9e8..aefdd0a9bba58 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -27ebaec7d29d3910dd5e6687c70dfefc001bdfe6 +a53f1e983e8b4384e1b82e266613c55a3c88ddd4 From 894ea20f11adf21639fd4f8b9f482b725b79d43b Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 15:34:12 -0500 Subject: [PATCH 15/28] e049bbf41 Roll Fuchsia Mac SDK from HHADjSDGmZSkODScd... to c1-ICa-ToxzhYLG7F... (flutter/engine#38520) (#117690) --- bin/internal/engine.version | 2 +- bin/internal/fuchsia-mac.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index aefdd0a9bba58..dfdc672ad9ca2 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -a53f1e983e8b4384e1b82e266613c55a3c88ddd4 +e049bbf41bd9cc57ec98b6b837f27353d8fb6e63 diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version index 7ce9cb35fa9cd..0abc9da69c52b 100644 --- a/bin/internal/fuchsia-mac.version +++ b/bin/internal/fuchsia-mac.version @@ -1 +1 @@ -HHADjSDGmZSkODScd5stNi2tBI6O98wrD_smfIz71jsC +c1-ICa-ToxzhYLG7FP9Nnlzxd_piVys4eC3m6uk6RlQC From c956121ac098b91061bfc0a93c930121ff3279ba Mon Sep 17 00:00:00 2001 From: Xilai Zhang Date: Tue, 27 Dec 2022 13:22:16 -0800 Subject: [PATCH 16/28] Revert "Remove single-view assumption from ScrollPhysics (#117503)" (#117647) This reverts commit 999356b776f70132d569a37f13f65333a1bb0779. --- .../lib/demo/animation/home.dart | 16 ++++----- .../widgets/draggable_scrollable_sheet.dart | 8 ++--- .../src/widgets/list_wheel_scroll_view.dart | 13 +++---- .../lib/src/widgets/nested_scroll_view.dart | 4 --- .../flutter/lib/src/widgets/page_view.dart | 7 +--- .../lib/src/widgets/scroll_metrics.dart | 10 ------ .../lib/src/widgets/scroll_physics.dart | 34 ++++++------------- .../lib/src/widgets/scroll_position.dart | 5 --- .../scroll_position_with_single_context.dart | 2 +- .../flutter/lib/src/widgets/scrollable.dart | 6 ---- .../flutter/test/material/scrollbar_test.dart | 1 - .../flutter/test/widgets/page_view_test.dart | 1 - .../test/widgets/scroll_physics_test.dart | 29 ++++++---------- .../widgets/scrollable_animations_test.dart | 4 +-- .../flutter/test/widgets/scrollbar_test.dart | 1 - .../test/widgets/slivers_evil_test.dart | 2 +- 16 files changed, 41 insertions(+), 102 deletions(-) diff --git a/dev/integration_tests/flutter_gallery/lib/demo/animation/home.dart b/dev/integration_tests/flutter_gallery/lib/demo/animation/home.dart index 593e55db54301..ce08027c61413 100644 --- a/dev/integration_tests/flutter_gallery/lib/demo/animation/home.dart +++ b/dev/integration_tests/flutter_gallery/lib/demo/animation/home.dart @@ -371,14 +371,14 @@ class _SnappingScrollPhysics extends ClampingScrollPhysics { return _SnappingScrollPhysics(parent: buildParent(ancestor), midScrollOffset: midScrollOffset); } - Simulation _toMidScrollOffsetSimulation(double offset, double dragVelocity, ScrollMetrics metrics) { + Simulation _toMidScrollOffsetSimulation(double offset, double dragVelocity) { final double velocity = math.max(dragVelocity, minFlingVelocity); - return ScrollSpringSimulation(spring, offset, midScrollOffset, velocity, tolerance: toleranceFor(metrics)); + return ScrollSpringSimulation(spring, offset, midScrollOffset, velocity, tolerance: tolerance); } - Simulation _toZeroScrollOffsetSimulation(double offset, double dragVelocity, ScrollMetrics metrics) { + Simulation _toZeroScrollOffsetSimulation(double offset, double dragVelocity) { final double velocity = math.max(dragVelocity, minFlingVelocity); - return ScrollSpringSimulation(spring, offset, 0.0, velocity, tolerance: toleranceFor(metrics)); + return ScrollSpringSimulation(spring, offset, 0.0, velocity, tolerance: tolerance); } @override @@ -396,10 +396,10 @@ class _SnappingScrollPhysics extends ClampingScrollPhysics { return simulation; } if (dragVelocity > 0.0) { - return _toMidScrollOffsetSimulation(offset, dragVelocity, position); + return _toMidScrollOffsetSimulation(offset, dragVelocity); } if (dragVelocity < 0.0) { - return _toZeroScrollOffsetSimulation(offset, dragVelocity, position); + return _toZeroScrollOffsetSimulation(offset, dragVelocity); } } else { // The user ended the drag with little or no velocity. If they @@ -408,10 +408,10 @@ class _SnappingScrollPhysics extends ClampingScrollPhysics { // otherwise snap to zero. final double snapThreshold = midScrollOffset / 2.0; if (offset >= snapThreshold && offset < midScrollOffset) { - return _toMidScrollOffsetSimulation(offset, dragVelocity, position); + return _toMidScrollOffsetSimulation(offset, dragVelocity); } if (offset > 0.0 && offset < snapThreshold) { - return _toZeroScrollOffsetSimulation(offset, dragVelocity, position); + return _toZeroScrollOffsetSimulation(offset, dragVelocity); } } return simulation; diff --git a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart index c2d55783c71f4..7df9c4934dbfe 100644 --- a/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart +++ b/packages/flutter/lib/src/widgets/draggable_scrollable_sheet.dart @@ -902,7 +902,7 @@ class _DraggableScrollableSheetScrollPosition extends ScrollPositionWithSingleCo bool get _isAtSnapSize { return extent.snapSizes.any( (double snapSize) { - return (extent.currentSize - snapSize).abs() <= extent.pixelsToSize(physics.toleranceFor(this).distance); + return (extent.currentSize - snapSize).abs() <= extent.pixelsToSize(physics.tolerance.distance); }, ); } @@ -937,7 +937,7 @@ class _DraggableScrollableSheetScrollPosition extends ScrollPositionWithSingleCo initialVelocity: velocity, pixelSnapSize: extent.pixelSnapSizes, snapAnimationDuration: extent.snapAnimationDuration, - tolerance: physics.toleranceFor(this), + tolerance: physics.tolerance, ); } else { // The iOS bouncing simulation just isn't right here - once we delegate @@ -946,7 +946,7 @@ class _DraggableScrollableSheetScrollPosition extends ScrollPositionWithSingleCo // Run the simulation in terms of pixels, not extent. position: extent.currentPixels, velocity: velocity, - tolerance: physics.toleranceFor(this), + tolerance: physics.tolerance, ); } @@ -965,7 +965,7 @@ class _DraggableScrollableSheetScrollPosition extends ScrollPositionWithSingleCo // Make sure we pass along enough velocity to keep scrolling - otherwise // we just "bounce" off the top making it look like the list doesn't // have more to scroll. - velocity = ballisticController.velocity + (physics.toleranceFor(this).velocity * ballisticController.velocity.sign); + velocity = ballisticController.velocity + (physics.tolerance.velocity * ballisticController.velocity.sign); super.goBallistic(velocity); ballisticController.stop(); } else if (ballisticController.isCompleted) { diff --git a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart index 8481bf471774d..caff1e9dab87d 100644 --- a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart +++ b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart @@ -316,7 +316,6 @@ class FixedExtentMetrics extends FixedScrollMetrics { required super.viewportDimension, required super.axisDirection, required this.itemIndex, - required super.devicePixelRatio, }); @override @@ -327,7 +326,6 @@ class FixedExtentMetrics extends FixedScrollMetrics { double? viewportDimension, AxisDirection? axisDirection, int? itemIndex, - double? devicePixelRatio, }) { return FixedExtentMetrics( minScrollExtent: minScrollExtent ?? (hasContentDimensions ? this.minScrollExtent : null), @@ -336,7 +334,6 @@ class FixedExtentMetrics extends FixedScrollMetrics { viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, itemIndex: itemIndex ?? this.itemIndex, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, ); } @@ -402,7 +399,6 @@ class _FixedExtentScrollPosition extends ScrollPositionWithSingleContext impleme double? viewportDimension, AxisDirection? axisDirection, int? itemIndex, - double? devicePixelRatio, }) { return FixedExtentMetrics( minScrollExtent: minScrollExtent ?? (hasContentDimensions ? this.minScrollExtent : null), @@ -411,7 +407,6 @@ class _FixedExtentScrollPosition extends ScrollPositionWithSingleContext impleme viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, itemIndex: itemIndex ?? this.itemIndex, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, ); } } @@ -510,8 +505,8 @@ class FixedExtentScrollPhysics extends ScrollPhysics { // Scenario 3: // If there's no velocity and we're already at where we intend to land, // do nothing. - if (velocity.abs() < toleranceFor(position).velocity - && (settlingPixels - metrics.pixels).abs() < toleranceFor(position).distance) { + if (velocity.abs() < tolerance.velocity + && (settlingPixels - metrics.pixels).abs() < tolerance.distance) { return null; } @@ -524,7 +519,7 @@ class FixedExtentScrollPhysics extends ScrollPhysics { metrics.pixels, settlingPixels, velocity, - tolerance: toleranceFor(position), + tolerance: tolerance, ); } @@ -535,7 +530,7 @@ class FixedExtentScrollPhysics extends ScrollPhysics { metrics.pixels, settlingPixels, velocity, - toleranceFor(position).velocity * velocity.sign, + tolerance.velocity * velocity.sign, ); } } diff --git a/packages/flutter/lib/src/widgets/nested_scroll_view.dart b/packages/flutter/lib/src/widgets/nested_scroll_view.dart index 822f59888d6d1..2987b2b04c423 100644 --- a/packages/flutter/lib/src/widgets/nested_scroll_view.dart +++ b/packages/flutter/lib/src/widgets/nested_scroll_view.dart @@ -526,7 +526,6 @@ class _NestedScrollMetrics extends FixedScrollMetrics { required super.pixels, required super.viewportDimension, required super.axisDirection, - required super.devicePixelRatio, required this.minRange, required this.maxRange, required this.correctionOffset, @@ -539,7 +538,6 @@ class _NestedScrollMetrics extends FixedScrollMetrics { double? pixels, double? viewportDimension, AxisDirection? axisDirection, - double? devicePixelRatio, double? minRange, double? maxRange, double? correctionOffset, @@ -550,7 +548,6 @@ class _NestedScrollMetrics extends FixedScrollMetrics { pixels: pixels ?? (hasPixels ? this.pixels : null), viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, minRange: minRange ?? this.minRange, maxRange: maxRange ?? this.maxRange, correctionOffset: correctionOffset ?? this.correctionOffset, @@ -818,7 +815,6 @@ class _NestedScrollCoordinator implements ScrollActivityDelegate, ScrollHoldCont minRange: minRange, maxRange: maxRange, correctionOffset: correctionOffset, - devicePixelRatio: _outerPosition!.devicePixelRatio, ); } diff --git a/packages/flutter/lib/src/widgets/page_view.dart b/packages/flutter/lib/src/widgets/page_view.dart index 4ef93eed89090..f8ef1c1cfa649 100644 --- a/packages/flutter/lib/src/widgets/page_view.dart +++ b/packages/flutter/lib/src/widgets/page_view.dart @@ -273,7 +273,6 @@ class PageMetrics extends FixedScrollMetrics { required super.viewportDimension, required super.axisDirection, required this.viewportFraction, - required super.devicePixelRatio, }); @override @@ -284,7 +283,6 @@ class PageMetrics extends FixedScrollMetrics { double? viewportDimension, AxisDirection? axisDirection, double? viewportFraction, - double? devicePixelRatio, }) { return PageMetrics( minScrollExtent: minScrollExtent ?? (hasContentDimensions ? this.minScrollExtent : null), @@ -293,7 +291,6 @@ class PageMetrics extends FixedScrollMetrics { viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, viewportFraction: viewportFraction ?? this.viewportFraction, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, ); } @@ -496,7 +493,6 @@ class _PagePosition extends ScrollPositionWithSingleContext implements PageMetri double? viewportDimension, AxisDirection? axisDirection, double? viewportFraction, - double? devicePixelRatio, }) { return PageMetrics( minScrollExtent: minScrollExtent ?? (hasContentDimensions ? this.minScrollExtent : null), @@ -505,7 +501,6 @@ class _PagePosition extends ScrollPositionWithSingleContext implements PageMetri viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, viewportFraction: viewportFraction ?? this.viewportFraction, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, ); } } @@ -578,7 +573,7 @@ class PageScrollPhysics extends ScrollPhysics { (velocity >= 0.0 && position.pixels >= position.maxScrollExtent)) { return super.createBallisticSimulation(position, velocity); } - final Tolerance tolerance = toleranceFor(position); + final Tolerance tolerance = this.tolerance; final double target = _getTargetPixels(position, tolerance, velocity); if (target != position.pixels) { return ScrollSpringSimulation(spring, position.pixels, target, velocity, tolerance: tolerance); diff --git a/packages/flutter/lib/src/widgets/scroll_metrics.dart b/packages/flutter/lib/src/widgets/scroll_metrics.dart index ca7cf48ce3cf0..10c20da60c46b 100644 --- a/packages/flutter/lib/src/widgets/scroll_metrics.dart +++ b/packages/flutter/lib/src/widgets/scroll_metrics.dart @@ -46,7 +46,6 @@ mixin ScrollMetrics { double? pixels, double? viewportDimension, AxisDirection? axisDirection, - double? devicePixelRatio, }) { return FixedScrollMetrics( minScrollExtent: minScrollExtent ?? (hasContentDimensions ? this.minScrollExtent : null), @@ -54,7 +53,6 @@ mixin ScrollMetrics { pixels: pixels ?? (hasPixels ? this.pixels : null), viewportDimension: viewportDimension ?? (hasViewportDimension ? this.viewportDimension : null), axisDirection: axisDirection ?? this.axisDirection, - devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio, ); } @@ -126,10 +124,6 @@ mixin ScrollMetrics { /// The quantity of content conceptually "below" the viewport in the scrollable. /// This is the content below the content described by [extentInside]. double get extentAfter => math.max(maxScrollExtent - pixels, 0.0); - - /// The [FlutterView.devicePixelRatio] of the view that the [Scrollable] - /// associated with this metrics object is drawn into. - double get devicePixelRatio; } /// An immutable snapshot of values associated with a [Scrollable] viewport. @@ -143,7 +137,6 @@ class FixedScrollMetrics with ScrollMetrics { required double? pixels, required double? viewportDimension, required this.axisDirection, - required this.devicePixelRatio, }) : _minScrollExtent = minScrollExtent, _maxScrollExtent = maxScrollExtent, _pixels = pixels, @@ -177,9 +170,6 @@ class FixedScrollMetrics with ScrollMetrics { @override final AxisDirection axisDirection; - @override - final double devicePixelRatio; - @override String toString() { return '${objectRuntimeType(this, 'FixedScrollMetrics')}(${extentBefore.toStringAsFixed(1)}..[${extentInside.toStringAsFixed(1)}]..${extentAfter.toStringAsFixed(1)})'; diff --git a/packages/flutter/lib/src/widgets/scroll_physics.dart b/packages/flutter/lib/src/widgets/scroll_physics.dart index bca75a02283a4..e125e5d21729f 100644 --- a/packages/flutter/lib/src/widgets/scroll_physics.dart +++ b/packages/flutter/lib/src/widgets/scroll_physics.dart @@ -6,7 +6,6 @@ import 'dart:math' as math; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/painting.dart' show AxisDirection; import 'package:flutter/physics.dart'; import 'binding.dart' show WidgetsBinding; @@ -384,29 +383,16 @@ class ScrollPhysics { /// The spring to use for ballistic simulations. SpringDescription get spring => parent?.spring ?? _kDefaultSpring; - /// Deprecated. Call [toleranceFor] instead. - @Deprecated( - 'Call toleranceFor instead. ' - 'This feature was deprecated after v3.7.0-13.0.pre.', - ) - Tolerance get tolerance { - return toleranceFor(FixedScrollMetrics( - minScrollExtent: null, - maxScrollExtent: null, - pixels: null, - viewportDimension: null, - axisDirection: AxisDirection.down, - devicePixelRatio: WidgetsBinding.instance.window.devicePixelRatio, - )); - } + /// The default accuracy to which scrolling is computed. + static final Tolerance _kDefaultTolerance = Tolerance( + // TODO(ianh): Handle the case of the device pixel ratio changing. + // TODO(ianh): Get this from the local MediaQuery not dart:ui's window object. + velocity: 1.0 / (0.050 * WidgetsBinding.instance.window.devicePixelRatio), // logical pixels per second + distance: 1.0 / WidgetsBinding.instance.window.devicePixelRatio, // logical pixels + ); /// The tolerance to use for ballistic simulations. - Tolerance toleranceFor(ScrollMetrics metrics) { - return parent?.toleranceFor(metrics) ?? Tolerance( - velocity: 1.0 / (0.050 * metrics.devicePixelRatio), // logical pixels per second - distance: 1.0 / metrics.devicePixelRatio, // logical pixels - ); - } + Tolerance get tolerance => parent?.tolerance ?? _kDefaultTolerance; /// The minimum distance an input pointer drag must have moved to /// to be considered a scroll fling gesture. @@ -710,7 +696,7 @@ class BouncingScrollPhysics extends ScrollPhysics { @override Simulation? createBallisticSimulation(ScrollMetrics position, double velocity) { - final Tolerance tolerance = toleranceFor(position); + final Tolerance tolerance = this.tolerance; if (velocity.abs() >= tolerance.velocity || position.outOfRange) { double constantDeceleration; switch (decelerationRate) { @@ -854,7 +840,7 @@ class ClampingScrollPhysics extends ScrollPhysics { @override Simulation? createBallisticSimulation(ScrollMetrics position, double velocity) { - final Tolerance tolerance = toleranceFor(position); + final Tolerance tolerance = this.tolerance; if (position.outOfRange) { double? end; if (position.pixels > position.maxScrollExtent) { diff --git a/packages/flutter/lib/src/widgets/scroll_position.dart b/packages/flutter/lib/src/widgets/scroll_position.dart index 9eb723d23b625..db363517c3725 100644 --- a/packages/flutter/lib/src/widgets/scroll_position.dart +++ b/packages/flutter/lib/src/widgets/scroll_position.dart @@ -12,7 +12,6 @@ import 'package:flutter/scheduler.dart'; import 'basic.dart'; import 'framework.dart'; -import 'media_query.dart'; import 'notification_listener.dart'; import 'page_storage.dart'; import 'scroll_activity.dart'; @@ -20,7 +19,6 @@ import 'scroll_context.dart'; import 'scroll_metrics.dart'; import 'scroll_notification.dart'; import 'scroll_physics.dart'; -import 'view.dart'; export 'scroll_activity.dart' show ScrollHoldController; @@ -244,9 +242,6 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { isScrollingNotifier.value = activity!.isScrolling; } - @override - double get devicePixelRatio => MediaQuery.maybeDevicePixelRatioOf(context.storageContext) ?? View.of(context.storageContext).devicePixelRatio; - /// Update the scroll position ([pixels]) to a given pixel value. /// /// This should only be called by the current [ScrollActivity], either during diff --git a/packages/flutter/lib/src/widgets/scroll_position_with_single_context.dart b/packages/flutter/lib/src/widgets/scroll_position_with_single_context.dart index 06e7325f5d21a..86ef6966d8f3e 100644 --- a/packages/flutter/lib/src/widgets/scroll_position_with_single_context.dart +++ b/packages/flutter/lib/src/widgets/scroll_position_with_single_context.dart @@ -176,7 +176,7 @@ class ScrollPositionWithSingleContext extends ScrollPosition implements ScrollAc required Duration duration, required Curve curve, }) { - if (nearEqual(to, pixels, physics.toleranceFor(this).distance)) { + if (nearEqual(to, pixels, physics.tolerance.distance)) { // Skip the animation, go straight to the position as we are already close. jumpTo(to); return Future.value(); diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index fca3892d321a7..5f32d8ffd3183 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -727,12 +727,6 @@ class ScrollableState extends State with TickerProviderStateMixin, R } void _handleDragCancel() { - if (_gestureDetectorKey.currentContext == null) { - // The cancel was caused by the GestureDetector getting disposed, which - // means we will get disposed momentarily as well and shouldn't do - // any work. - return; - } // _hold might be null if the drag started. // _drag might be null if the drag activity ended and called _disposeDrag. assert(_hold == null || _drag == null); diff --git a/packages/flutter/test/material/scrollbar_test.dart b/packages/flutter/test/material/scrollbar_test.dart index bcf7f7de2b0be..eb0aa6811d896 100644 --- a/packages/flutter/test/material/scrollbar_test.dart +++ b/packages/flutter/test/material/scrollbar_test.dart @@ -148,7 +148,6 @@ void main() { pixels: 0.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: tester.binding.window.devicePixelRatio, ); scrollPainter!.update(metrics, AxisDirection.down); diff --git a/packages/flutter/test/widgets/page_view_test.dart b/packages/flutter/test/widgets/page_view_test.dart index 971422d838374..37716e120d387 100644 --- a/packages/flutter/test/widgets/page_view_test.dart +++ b/packages/flutter/test/widgets/page_view_test.dart @@ -1048,7 +1048,6 @@ void main() { viewportDimension: 25.0, axisDirection: AxisDirection.right, viewportFraction: 1.0, - devicePixelRatio: tester.binding.window.devicePixelRatio, ); expect(page.page, 6); final PageMetrics page2 = page.copyWith( diff --git a/packages/flutter/test/widgets/scroll_physics_test.dart b/packages/flutter/test/widgets/scroll_physics_test.dart index e24f2e8db2528..91c42aa937e6a 100644 --- a/packages/flutter/test/widgets/scroll_physics_test.dart +++ b/packages/flutter/test/widgets/scroll_physics_test.dart @@ -107,7 +107,6 @@ void main() { pixels: 20.0, viewportDimension: 500.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); const BouncingScrollPhysics bounce = BouncingScrollPhysics(); @@ -130,12 +129,11 @@ void main() { test('overscroll is progressively harder', () { final ScrollMetrics lessOverscrolledPosition = FixedScrollMetrics( - minScrollExtent: 0.0, - maxScrollExtent: 1000.0, - pixels: -20.0, - viewportDimension: 100.0, - axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, + minScrollExtent: 0.0, + maxScrollExtent: 1000.0, + pixels: -20.0, + viewportDimension: 100.0, + axisDirection: AxisDirection.down, ); final ScrollMetrics moreOverscrolledPosition = FixedScrollMetrics( @@ -144,7 +142,6 @@ void main() { pixels: -40.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); final double lessOverscrollApplied = @@ -173,7 +170,6 @@ void main() { pixels: -20.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); final double easingApplied = @@ -190,7 +186,6 @@ void main() { pixels: 300.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); expect( @@ -210,7 +205,6 @@ void main() { pixels: -20.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); final double easingApplied = @@ -223,12 +217,11 @@ void main() { test('overscroll a small list and a big list works the same way', () { final ScrollMetrics smallListOverscrolledPosition = FixedScrollMetrics( - minScrollExtent: 0.0, - maxScrollExtent: 10.0, - pixels: -20.0, - viewportDimension: 100.0, - axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, + minScrollExtent: 0.0, + maxScrollExtent: 10.0, + pixels: -20.0, + viewportDimension: 100.0, + axisDirection: AxisDirection.down, ); final ScrollMetrics bigListOverscrolledPosition = FixedScrollMetrics( @@ -237,7 +230,6 @@ void main() { pixels: -20.0, viewportDimension: 100.0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); final double smallListOverscrollApplied = @@ -262,7 +254,6 @@ void main() { maxScrollExtent: 1000, viewportDimension: 0, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); expect(position.pixels, pixels); late FlutterError error; diff --git a/packages/flutter/test/widgets/scrollable_animations_test.dart b/packages/flutter/test/widgets/scrollable_animations_test.dart index b055f6a635fe8..117fceeaeb466 100644 --- a/packages/flutter/test/widgets/scrollable_animations_test.dart +++ b/packages/flutter/test/widgets/scrollable_animations_test.dart @@ -41,7 +41,7 @@ void main() { expectNoAnimation(); - final double halfTolerance = controller.position.physics.toleranceFor(controller.position).distance / 2; + final double halfTolerance = controller.position.physics.tolerance.distance / 2; expect(halfTolerance, isNonZero); final double targetPosition = controller.position.pixels + halfTolerance; controller.position.animateTo(targetPosition, duration: const Duration(seconds: 10), curve: Curves.linear); @@ -64,7 +64,7 @@ void main() { expectNoAnimation(); - final double doubleTolerance = controller.position.physics.toleranceFor(controller.position).distance * 2; + final double doubleTolerance = controller.position.physics.tolerance.distance * 2; expect(doubleTolerance, isNonZero); final double targetPosition = controller.position.pixels + doubleTolerance; controller.position.animateTo(targetPosition, duration: const Duration(seconds: 10), curve: Curves.linear); diff --git a/packages/flutter/test/widgets/scrollbar_test.dart b/packages/flutter/test/widgets/scrollbar_test.dart index 5e020cf646402..0d4881afb17be 100644 --- a/packages/flutter/test/widgets/scrollbar_test.dart +++ b/packages/flutter/test/widgets/scrollbar_test.dart @@ -83,7 +83,6 @@ void main() { pixels: 0, viewportDimension: 100, axisDirection: AxisDirection.down, - devicePixelRatio: 3.0, ); test( diff --git a/packages/flutter/test/widgets/slivers_evil_test.dart b/packages/flutter/test/widgets/slivers_evil_test.dart index 2c9aa0ef35366..cf88354494a38 100644 --- a/packages/flutter/test/widgets/slivers_evil_test.dart +++ b/packages/flutter/test/widgets/slivers_evil_test.dart @@ -53,7 +53,7 @@ class TestScrollPhysics extends ClampingScrollPhysics { } @override - Tolerance toleranceFor(ScrollMetrics metrics) => const Tolerance(velocity: 20.0, distance: 1.0); + Tolerance get tolerance => const Tolerance(velocity: 20.0, distance: 1.0); } void main() { From 0dc973955de8630da28e9306782513c322120084 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 16:26:19 -0500 Subject: [PATCH 17/28] 6e6a6538f Roll Skia from 2b6d44eb650b to 34708fefacd0 (1 revision) (flutter/engine#38521) (#117694) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index dfdc672ad9ca2..87f336b977042 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -e049bbf41bd9cc57ec98b6b837f27353d8fb6e63 +6e6a6538f9e217b0a5fb94550cf16d7c12ec2c3d From 95a184dcfd89accc93616632fd7fed26af613c8d Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 17:04:29 -0500 Subject: [PATCH 18/28] 10ce8cd38 [fuchsia] Debugging code for crash. (flutter/engine#38518) (#117697) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 87f336b977042..3db570097faea 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -6e6a6538f9e217b0a5fb94550cf16d7c12ec2c3d +10ce8cd3863ac83cb934f08b2bb48044162b4e2d From a89d135f412df031a37267a9a8c3bf595e71dd9d Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 17:51:20 -0500 Subject: [PATCH 19/28] afe49825e Roll Skia from 34708fefacd0 to 1a93cfdae2fd (1 revision) (flutter/engine#38522) (#117699) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 3db570097faea..4375d9d074880 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -10ce8cd3863ac83cb934f08b2bb48044162b4e2d +afe49825e4c4bf1d44a32b9515dac0ec27878b51 From 0ddfa72f0f5c7d8d8c56f40d6b054529260f3ef5 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 18:43:26 -0500 Subject: [PATCH 20/28] 6128780f1 Roll Dart SDK from 742e1dc3e17f to 68d8b0f58be7 (1 revision) (flutter/engine#38523) (#117701) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 4375d9d074880..80ef8f5071958 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -afe49825e4c4bf1d44a32b9515dac0ec27878b51 +6128780f1ea429a0140dc1431ba0a0de35576157 From 4e08ebb2bf067c938d1f7ae2c8fa01d189600b24 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 19:31:24 -0500 Subject: [PATCH 21/28] 8294e2693 Roll Skia from 1a93cfdae2fd to c5c0387b3399 (2 revisions) (flutter/engine#38524) (#117702) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 80ef8f5071958..5910cff19480c 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -6128780f1ea429a0140dc1431ba0a0de35576157 +8294e2693a04e9905e4072ec053aba6d74084b79 From d108c912cf8aea1e649201a19bf2004f1670aea0 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Tue, 27 Dec 2022 23:15:25 -0500 Subject: [PATCH 22/28] bfecc4b18 Roll Dart SDK from 68d8b0f58be7 to 5a173adb22ed (1 revision) (flutter/engine#38525) (#117707) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 5910cff19480c..7bc11c60aa080 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -8294e2693a04e9905e4072ec053aba6d74084b79 +bfecc4b18d9f9dde05ac66faa0e3bb6bfb588b7b From 2864acc828cb9c7afc334704efdc2913bc54fabc Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 01:33:22 -0500 Subject: [PATCH 23/28] 2d431852d Roll Skia from c5c0387b3399 to 656bb22387ac (1 revision) (flutter/engine#38526) (#117711) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 7bc11c60aa080..c2c3839644533 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -bfecc4b18d9f9dde05ac66faa0e3bb6bfb588b7b +2d431852d7c3df9486d7aafdff6bd8b44956dc3c From 6f8d17609cb6eef3b74be42b48fb6d0fc8d9820f Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 02:15:24 -0500 Subject: [PATCH 24/28] 74ef2cbc8 Roll Fuchsia Linux SDK from iQT5jpUhipvetxSiH... to yX7ot9Un0bpYQ-XX7... (flutter/engine#38527) (#117713) --- bin/internal/engine.version | 2 +- bin/internal/fuchsia-linux.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index c2c3839644533..a658cca9dea11 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -2d431852d7c3df9486d7aafdff6bd8b44956dc3c +74ef2cbc8404de28a3a2363afa838d4eb3134da4 diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version index 9b03a197d82a1..960a6f03b8981 100644 --- a/bin/internal/fuchsia-linux.version +++ b/bin/internal/fuchsia-linux.version @@ -1 +1 @@ -iQT5jpUhipvetxSiHsBkeVgedBMtvCWXShpakF3mi8YC +yX7ot9Un0bpYQ-XX7EEDQKYsgkZATwJjNQscCIzaVlgC From eda7aab33702679e2dfc63e8a81d0c453c07270b Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 03:18:23 -0500 Subject: [PATCH 25/28] dc6670f7b Roll Dart SDK from 5a173adb22ed to 2541cf36607f (1 revision) (flutter/engine#38528) (#117715) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index a658cca9dea11..89c2f6d952100 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -74ef2cbc8404de28a3a2363afa838d4eb3134da4 +dc6670f7bc16818c396ffbe32080b833ac82d16a From 2223235895b8b081ac4364562d929d465e84bd36 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 04:09:26 -0500 Subject: [PATCH 26/28] 8d4546d5b Roll Skia from 656bb22387ac to 913271ba5cbb (2 revisions) (flutter/engine#38529) (#117719) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 89c2f6d952100..f6cd3fc7915cd 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -dc6670f7bc16818c396ffbe32080b833ac82d16a +8d4546d5b74ac98ca7ee3c8a90fd68df3f51367a From f24df972b1f38ecaac09d1842cbf384550e0fd60 Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 05:03:30 -0500 Subject: [PATCH 27/28] 3bb936567 Roll Skia from 913271ba5cbb to f78bb848bbe1 (2 revisions) (flutter/engine#38531) (#117721) --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index f6cd3fc7915cd..1fad32208d945 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -8d4546d5b74ac98ca7ee3c8a90fd68df3f51367a +3bb936567e60d2a4003ca52123e27828450556db From 17482fd425ee76bffc7f3eb9f613a0a4fbaa771c Mon Sep 17 00:00:00 2001 From: engine-flutter-autoroll Date: Wed, 28 Dec 2022 08:11:29 -0500 Subject: [PATCH 28/28] 9e63c1ae1 Roll Fuchsia Mac SDK from c1-ICa-ToxzhYLG7F... to jV7nfgH1Tb3Lw0w_S... (flutter/engine#38532) (#117731) --- bin/internal/engine.version | 2 +- bin/internal/fuchsia-mac.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 1fad32208d945..5bf870006ff18 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -3bb936567e60d2a4003ca52123e27828450556db +9e63c1ae1480223f8b866dfe3c7e524db9a6f477 diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version index 0abc9da69c52b..6f4edb259c710 100644 --- a/bin/internal/fuchsia-mac.version +++ b/bin/internal/fuchsia-mac.version @@ -1 +1 @@ -c1-ICa-ToxzhYLG7FP9Nnlzxd_piVys4eC3m6uk6RlQC +jV7nfgH1Tb3Lw0w_S2nGum1ZVQ0oOcHlaMoK9JqfjxYC