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 593e55db5430192cd99b45f9433b0d0a59058cf3..ce08027c61413f66fb69add18e73edbf635aaa11 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 c2d55783c71f4dbbaa7da6cd71e29fdd557004d0..7df9c4934dbfeafbe4bd2ee08f302fd391103263 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 8481bf471774db84fc3d08ee8acdcd8567f168b6..caff1e9dab87da05d0788d63621205e72f8e4fb8 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 822f59888d6d11ded032df4d8210ec02c176ac45..2987b2b04c423b086861fc4ce471a1215c9bec18 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 4ef93eed89090a3fc57525a93905cb812f0c9926..f8ef1c1cfa649796fc3ef6def8d19b839be2d15a 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 ca7cf48ce3cf043565416abf0b67dd329b6b9351..10c20da60c46b85f8dd12a9f85f6fddb12981ad3 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 bca75a02283a4e06041c81580ac71b806e242ccf..e125e5d21729faa91f02d9bd83c87523176c8bd5 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 9eb723d23b625809fefc269224f6b2d94f75fa00..db363517c3725f43296b0b9f76c3efe738020c20 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 06e7325f5d21a905ed7e275b6f6f2a416f27e8aa..86ef6966d8f3ee9acbf4d1f6dff014fc30b93aef 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<void>.value();
diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart
index fca3892d321a7d837ba49916a792707b3fb2b7f9..5f32d8ffd3183bd03ebf601c9e9e6bda50303301 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<Scrollable> 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 bcf7f7de2b0be528276eebdd208ee59437c0594a..eb0aa6811d896e756954ac08dfeac1f198328c94 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 971422d8383749821612c6b63c85228ff6005014..37716e120d3878f4db64c6b444804fe42e2a6a55 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 e24f2e8db25288dd249ebfd607106c1e683e872f..91c42aa937e6a17ffc860f99bb2cbdd5c2518325 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 b055f6a635fe8e14160e88354bda0ce20295025d..117fceeaeb466eca080b0bedb53ed8be4f0221a6 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 5e020cf6464024f1165694a92d26e9a702260446..0d4881afb17be0a2be5f2a8bcc6087e594cc43a6 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 2c9aa0ef353667dfeb3f0d8a0b50e5dd20d90719..cf88354494a387cfd5d1e66f349fd2f36c7292fb 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() {