Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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': 'b29f228f62e29dd7e55f5cc941eb2ee9c9df971d',
'dart_revision': '016e8880f0ab0d2a1c72a2110458b240119cfdc1',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down Expand Up @@ -349,7 +349,7 @@ deps = {
Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',

'src/third_party/dart/tools/sdks':
{'packages': [{'version': 'version:2.10.0-3.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
{'packages': [{'version': 'version:2.10.0-79.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},

# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.

Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: a68684fe33cc6f9987196e5322506a33
Signature: 76e2f8acbb71b60a37b41449d0b46be8

UNUSED LICENSES:

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/lerp.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ double? lerpDouble(num? a, num? b, double t) {
assert(a.isFinite, 'Cannot interpolate between finite and non-finite values');
assert(b.isFinite, 'Cannot interpolate between finite and non-finite values');
assert(t.isFinite, 't must be finite when interpolating between values');
return a * (1.0 - t) + b * t as double;
return a * (1.0 - t) + b * t;
}

/// Linearly interpolate between two doubles.
Expand Down
24 changes: 12 additions & 12 deletions lib/ui/painting.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool _radiusIsValid(Radius radius) {
}

Color _scaleAlpha(Color a, double factor) {
return a.withAlpha((a.alpha * factor).round().clamp(0, 255) as int);
return a.withAlpha((a.alpha * factor).round().clamp(0, 255));
}

/// An immutable 32 bit color value in ARGB format.
Expand Down Expand Up @@ -4665,21 +4665,21 @@ class Shadow {
// of shadows contains non-nullable elements, unmigrated code can still
// pass nulls.
// ignore: unnecessary_null_comparison
if (shadow == null)
continue;
shadowOffset = shadowIndex * _kBytesPerShadow;
if (shadow != null) {
shadowOffset = shadowIndex * _kBytesPerShadow;

shadowsData.setInt32(_kColorOffset + shadowOffset,
shadow.color.value ^ Shadow._kColorDefault, _kFakeHostEndian);
shadowsData.setInt32(_kColorOffset + shadowOffset,
shadow.color.value ^ Shadow._kColorDefault, _kFakeHostEndian);

shadowsData.setFloat32(_kXOffset + shadowOffset,
shadow.offset.dx, _kFakeHostEndian);
shadowsData.setFloat32(_kXOffset + shadowOffset,
shadow.offset.dx, _kFakeHostEndian);

shadowsData.setFloat32(_kYOffset + shadowOffset,
shadow.offset.dy, _kFakeHostEndian);
shadowsData.setFloat32(_kYOffset + shadowOffset,
shadow.offset.dy, _kFakeHostEndian);

shadowsData.setFloat32(_kBlurOffset + shadowOffset,
shadow.blurRadius, _kFakeHostEndian);
shadowsData.setFloat32(_kBlurOffset + shadowOffset,
shadow.blurRadius, _kFakeHostEndian);
}
}

return shadowsData;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class FontWeight {
assert(t != null); // ignore: unnecessary_null_comparison
if (a == null && b == null)
return null;
return values[_lerpInt((a ?? normal).index, (b ?? normal).index, t).round().clamp(0, 8) as int];
return values[_lerpInt((a ?? normal).index, (b ?? normal).index, t).round().clamp(0, 8)];
}

@override
Expand Down