diff --git a/DEPS b/DEPS index 567de751b382b..6da2681ef2b85 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,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': '5ca1f32905272b891c87c1640167856fdcfbf0c2', + 'dart_revision': '551e405d0b5d7c367cd8f2aeba2be10f03e65146', # 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 a5bec3b1d077b..8627123af02b3 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: ab76ce6d3ea560de10d3451aa8438b6a +Signature: 8f2bb3254e69af1ec4d5371fa29ad12e UNUSED LICENSES: @@ -8387,8 +8387,18 @@ ORIGIN: ../../../third_party/dart/benchmarks/ListCopy/dart/ListCopy.dart + ../.. TYPE: LicenseType.bsd FILE: ../../../third_party/dart/benchmarks/ListCopy/dart/ListCopy.dart FILE: ../../../third_party/dart/benchmarks/ListCopy/dart2/ListCopy.dart +FILE: ../../../third_party/dart/benchmarks/MD5/dart/md5.dart +FILE: ../../../third_party/dart/benchmarks/MD5/dart2/md5.dart FILE: ../../../third_party/dart/benchmarks/RuntimeType/dart/RuntimeType.dart FILE: ../../../third_party/dart/benchmarks/RuntimeType/dart2/RuntimeType.dart +FILE: ../../../third_party/dart/benchmarks/SHA1/dart/sha1.dart +FILE: ../../../third_party/dart/benchmarks/SHA1/dart2/sha1.dart +FILE: ../../../third_party/dart/benchmarks/SHA256/dart/sha256.dart +FILE: ../../../third_party/dart/benchmarks/SHA256/dart2/sha256.dart +FILE: ../../../third_party/dart/benchmarks/SkeletalAnimation/dart/SkeletalAnimation.dart +FILE: ../../../third_party/dart/benchmarks/SkeletalAnimation/dart2/SkeletalAnimation.dart +FILE: ../../../third_party/dart/benchmarks/SkeletalAnimationSIMD/dart/SkeletalAnimationSIMD.dart +FILE: ../../../third_party/dart/benchmarks/SkeletalAnimationSIMD/dart2/SkeletalAnimationSIMD.dart FILE: ../../../third_party/dart/benchmarks/TypedDataDuplicate/dart/TypedDataDuplicate.dart FILE: ../../../third_party/dart/benchmarks/TypedDataDuplicate/dart2/TypedDataDuplicate.dart FILE: ../../../third_party/dart/benchmarks/Utf8Decode/dart/Utf8Decode.dart diff --git a/lib/web_ui/lib/src/engine/pointer_binding.dart b/lib/web_ui/lib/src/engine/pointer_binding.dart index ef17f7868a2ec..11cf24c2e0de3 100644 --- a/lib/web_ui/lib/src/engine/pointer_binding.dart +++ b/lib/web_ui/lib/src/engine/pointer_binding.dart @@ -261,8 +261,8 @@ mixin _WheelEventListenerMixin on _BaseAdapter { kind: ui.PointerDeviceKind.mouse, signalKind: ui.PointerSignalKind.scroll, device: _mouseDeviceId, - physicalX: event.client.x * ui.window.devicePixelRatio as double, - physicalY: event.client.y * ui.window.devicePixelRatio as double, + physicalX: event.client.x * ui.window.devicePixelRatio, + physicalY: event.client.y * ui.window.devicePixelRatio, buttons: event.buttons!, pressure: 1.0, pressureMin: 0.0, @@ -526,8 +526,8 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin { kind: kind, signalKind: ui.PointerSignalKind.none, device: device, - physicalX: event.client.x * ui.window.devicePixelRatio as double, - physicalY: event.client.y * ui.window.devicePixelRatio as double, + physicalX: event.client.x * ui.window.devicePixelRatio, + physicalY: event.client.y * ui.window.devicePixelRatio, buttons: details.buttons, pressure: event.pressure as double, pressureMin: 0.0, @@ -689,8 +689,8 @@ class _TouchAdapter extends _BaseAdapter { kind: ui.PointerDeviceKind.touch, signalKind: ui.PointerSignalKind.none, device: touch.identifier!, - physicalX: touch.client.x * ui.window.devicePixelRatio as double, - physicalY: touch.client.y * ui.window.devicePixelRatio as double, + physicalX: touch.client.x * ui.window.devicePixelRatio, + physicalY: touch.client.y * ui.window.devicePixelRatio, buttons: pressed ? _kPrimaryMouseButton : 0, pressure: 1.0, pressureMin: 0.0, @@ -798,8 +798,8 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin { kind: ui.PointerDeviceKind.mouse, signalKind: ui.PointerSignalKind.none, device: _mouseDeviceId, - physicalX: event.client.x * ui.window.devicePixelRatio as double, - physicalY: event.client.y * ui.window.devicePixelRatio as double, + physicalX: event.client.x * ui.window.devicePixelRatio, + physicalY: event.client.y * ui.window.devicePixelRatio, buttons: details.buttons, pressure: 1.0, pressureMin: 0.0, diff --git a/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart b/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart index 63371ccbe9e9a..43e25687a5350 100644 --- a/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart +++ b/lib/web_ui/lib/src/engine/semantics/semantics_helper.dart @@ -341,11 +341,11 @@ class MobileSemanticsEnabler extends SemanticsEnabler { final html.Rectangle activatingElementRect = domRenderer.glassPaneElement!.getBoundingClientRect(); final double midX = activatingElementRect.left + - (activatingElementRect.right - activatingElementRect.left) / 2 as double; + (activatingElementRect.right - activatingElementRect.left) / 2; final double midY = activatingElementRect.top + - (activatingElementRect.bottom - activatingElementRect.top) / 2 as double; - final double deltaX = activationPoint.x - midX as double; - final double deltaY = activationPoint.y - midY as double; + (activatingElementRect.bottom - activatingElementRect.top) / 2; + final double deltaX = activationPoint.x - midX; + final double deltaY = activationPoint.y - midY; final double deltaSquared = deltaX * deltaX + deltaY * deltaY; if (deltaSquared < 1.0) { safariEnableConditionPassed = true; diff --git a/lib/web_ui/lib/src/engine/text/measurement.dart b/lib/web_ui/lib/src/engine/text/measurement.dart index ac2de9edc3110..cad39df40708d 100644 --- a/lib/web_ui/lib/src/engine/text/measurement.dart +++ b/lib/web_ui/lib/src/engine/text/measurement.dart @@ -687,7 +687,7 @@ double _measureSubstring( final String sub = start == 0 && end == text.length ? text : text.substring(start, end); final double width = _canvasContext.measureText(sub).width! + - letterSpacing * sub.length as double; + letterSpacing * sub.length; // What we are doing here is we are rounding to the nearest 2nd decimal // point. So 39.999423 becomes 40, and 11.243982 becomes 11.24. diff --git a/lib/web_ui/lib/src/engine/text/ruler.dart b/lib/web_ui/lib/src/engine/text/ruler.dart index 32018f2515917..dea5babf93eca 100644 --- a/lib/web_ui/lib/src/engine/text/ruler.dart +++ b/lib/web_ui/lib/src/engine/text/ruler.dart @@ -794,9 +794,9 @@ class ParagraphRuler { } boxes.add(ui.TextBox.fromLTRBD( - rect.left + alignOffset as double, + rect.left + alignOffset, rect.top as double, - rect.right + alignOffset as double, + rect.right + alignOffset, rect.bottom as double, textDirection, )); diff --git a/lib/web_ui/lib/src/engine/window.dart b/lib/web_ui/lib/src/engine/window.dart index 7dbb1497c716d..41a1700fa09a6 100644 --- a/lib/web_ui/lib/src/engine/window.dart +++ b/lib/web_ui/lib/src/engine/window.dart @@ -73,8 +73,8 @@ class EngineWindow extends ui.Window { double windowInnerHeight; final html.VisualViewport? viewport = html.window.visualViewport; if (viewport != null) { - windowInnerWidth = viewport.width! * devicePixelRatio as double; - windowInnerHeight = viewport.height! * devicePixelRatio as double; + windowInnerWidth = viewport.width! * devicePixelRatio; + windowInnerHeight = viewport.height! * devicePixelRatio; } else { windowInnerWidth = html.window.innerWidth! * devicePixelRatio; windowInnerHeight = html.window.innerHeight! * devicePixelRatio; @@ -90,7 +90,7 @@ class EngineWindow extends ui.Window { double windowInnerHeight; final html.VisualViewport? viewport = html.window.visualViewport; if (viewport != null) { - windowInnerHeight = viewport.height! * devicePixelRatio as double; + windowInnerHeight = viewport.height! * devicePixelRatio; } else { windowInnerHeight = html.window.innerHeight! * devicePixelRatio; } @@ -117,8 +117,8 @@ class EngineWindow extends ui.Window { double height = 0; double width = 0; if (html.window.visualViewport != null) { - height = html.window.visualViewport!.height! * devicePixelRatio as double; - width = html.window.visualViewport!.width! * devicePixelRatio as double; + height = html.window.visualViewport!.height! * devicePixelRatio; + width = html.window.visualViewport!.width! * devicePixelRatio; } else { height = html.window.innerHeight! * devicePixelRatio; width = html.window.innerWidth! * devicePixelRatio; diff --git a/lib/web_ui/lib/src/ui/lerp.dart b/lib/web_ui/lib/src/ui/lerp.dart index 8287cbd4ee1cd..70b083874aa38 100644 --- a/lib/web_ui/lib/src/ui/lerp.dart +++ b/lib/web_ui/lib/src/ui/lerp.dart @@ -11,7 +11,7 @@ double? lerpDouble(num? a, num? b, double t) { } a ??= 0.0; b ??= 0.0; - return a + (b - a) * t as double; + return a + (b - a) * t; } double _lerpDouble(double a, double b, double t) {