diff --git a/lib/web_ui/lib/src/engine/pointer_binding.dart b/lib/web_ui/lib/src/engine/pointer_binding.dart index d4cb96616ef72..3794a7bc25d5b 100644 --- a/lib/web_ui/lib/src/engine/pointer_binding.dart +++ b/lib/web_ui/lib/src/engine/pointer_binding.dart @@ -656,7 +656,7 @@ mixin _WheelEventListenerMixin on _BaseAdapter { deltaX *= _view.physicalSize.width; deltaY *= _view.physicalSize.height; case domDeltaPixel: - if (operatingSystem == OperatingSystem.macOs && (isSafari || isFirefox)) { + if (operatingSystem == OperatingSystem.macOs) { // Safari and Firefox seem to report delta in logical pixels while // Chrome uses physical pixels. deltaX *= _view.devicePixelRatio; diff --git a/lib/web_ui/test/engine/pointer_binding_test.dart b/lib/web_ui/test/engine/pointer_binding_test.dart index 0e27270917244..d877f9b74e378 100644 --- a/lib/web_ui/test/engine/pointer_binding_test.dart +++ b/lib/web_ui/test/engine/pointer_binding_test.dart @@ -815,13 +815,12 @@ void testMain() { ); test( - 'converts scroll delta to physical pixels (Firefox)', + 'converts scroll delta to physical pixels (macOs)', () { final _ButtonedEventMixin context = _PointerEventContext(); const double dpi = 2.5; debugOperatingSystemOverride = OperatingSystem.macOs; - debugBrowserEngineOverride = BrowserEngine.firefox; EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpi); final List packets = []; @@ -854,52 +853,6 @@ void testMain() { expect(packets[0].data[0].scrollDeltaY, equals(10.0 * dpi)); EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0); - debugOperatingSystemOverride = null; - debugBrowserEngineOverride = null; - }, - ); - - test( - 'scroll delta are already in physical pixels (Chrome)', - () { - final _ButtonedEventMixin context = _PointerEventContext(); - - const double dpi = 2.5; - debugOperatingSystemOverride = OperatingSystem.macOs; - debugBrowserEngineOverride = BrowserEngine.blink; - EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(dpi); - - final List packets = []; - ui.PlatformDispatcher.instance.onPointerDataPacket = (ui.PointerDataPacket packet) { - packets.add(packet); - }; - - rootElement.dispatchEvent(context.wheel( - buttons: 0, - clientX: 10, - clientY: 10, - deltaX: 10, - deltaY: 10, - )); - - expect(packets, hasLength(1)); - - - // An add will be synthesized. - expect(packets[0].data, hasLength(2)); - expect(packets[0].data[0].change, equals(ui.PointerChange.add)); - // Scroll deltas should NOT be multiplied by `dpi`. - expect(packets[0].data[0].scrollDeltaX, equals(10.0)); - expect(packets[0].data[0].scrollDeltaY, equals(10.0)); - - expect(packets[0].data[1].change, equals(ui.PointerChange.hover)); - expect(packets[0].data[1].signalKind, equals(ui.PointerSignalKind.scroll)); - // Scroll deltas should NOT be multiplied by `dpi`. - expect(packets[0].data[0].scrollDeltaX, equals(10.0)); - expect(packets[0].data[0].scrollDeltaY, equals(10.0)); - - EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0); - debugOperatingSystemOverride = null; debugBrowserEngineOverride = null; }, );