From 1703ff491b44802ed54794fc61a46fedbf7e2ed7 Mon Sep 17 00:00:00 2001 From: asiva Date: Wed, 2 Sep 2020 21:47:29 -0700 Subject: [PATCH] Manual roll of Dart b29f228f62...016e8880f0 dart-lang/sdk@016e8880f0a Version 2.10.0-90.0.dev dart-lang/sdk@34f636ce1d8 Revert "[vm/io] Fix FileSystemWatcher enum name typo." dart-lang/sdk@7a02118a410 [vm/fuchsia]: Safely shutdown the async message loop. dart-lang/sdk@334d3681467 [analyzer_plugin] Remove unused dart:async imports dart-lang/sdk@047c0f860a5 [Analyzer] Support analyzing open files without open workspaces dart-lang/sdk@f846d0e7ea0 [analyzer_cli] Remove unused dart:async imports dart-lang/sdk@ba372d6e8a4 [dartdev] Remove unused dart:async import dart-lang/sdk@30cfb228c00 [nnbd_migration] Remove unused dart:async imports dart-lang/sdk@1134a0f17c8 [analysis_server] Remove unused dart:async imports dart-lang/sdk@3317d47c7de [_fe_analyzer_shared] Remove unused dart:async import dart-lang/sdk@0a036db5962 [vm/io] Fix FileSystemWatcher enum name typo. dart-lang/sdk@000f3135a5c [analyzer] Remove unused dart:async imports dart-lang/sdk@7817aa17967 [dartfix] Remove unused dart:async imports dart-lang/sdk@0144087619f Version 2.10.0-89.0.dev dart-lang/sdk@42dfb9d3046 Add `generateCallGraphWithDominators` method to generate a `CallGraph` from a precompiler trace. dart-lang/sdk@01024dfa5a8 Issue 43200. Report ASSIGNMENT_TO_FINAL when 'final late' has an initializer. dart-lang/sdk@ab16d79af97 Revert "Flow analysis changes to fix mixed-mode unsoundness loophole." dart-lang/sdk@7363adca67a [infra] Update checked-in SDKs to 2.10.0-79.0.dev dart-lang/sdk@d833f2f65c1 Flow analysis changes to fix mixed-mode unsoundness loophole. dart-lang/sdk@33e4a6bc2a8 Revert "[vm] Have Read/WriteStream use (S)LEB128 for variable-length encoding." dart-lang/sdk@d9dc24b53e7 Version 2.10.0-88.0.dev dart-lang/sdk@7130dd4d3d9 [cfe] Report error on non-void setter return type dart-lang/sdk@a7cb764aa45 [tests/ffi] Reinstate deleted test dart-lang/sdk@39689eb07cd [co19] Roll co19 to 9c07e26d67665de7972ba6f7e87369933a978545 dart-lang/sdk@1f92293fd58 Revert "[dart:html] Add 'creates' type description to JS calls" dart-lang/sdk@e44cf969c64 Fix creates value for getStats dart-lang/sdk@15201ebe5f1 Version 2.10.0-87.0.dev dart-lang/sdk@eb8dfee1074 [CFE] Clean up duplicate entries in spell checker lists --- DEPS | 4 ++-- ci/licenses_golden/licenses_third_party | 2 +- lib/ui/lerp.dart | 2 +- lib/ui/painting.dart | 24 ++++++++++++------------ lib/ui/text.dart | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DEPS b/DEPS index 2239bb6b620d9..6252f36f39165 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': '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 @@ -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. diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 7af7d3976a4dd..08fb4d577611f 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: a68684fe33cc6f9987196e5322506a33 +Signature: 76e2f8acbb71b60a37b41449d0b46be8 UNUSED LICENSES: diff --git a/lib/ui/lerp.dart b/lib/ui/lerp.dart index 2357433ba33d8..9c219dbb4c543 100644 --- a/lib/ui/lerp.dart +++ b/lib/ui/lerp.dart @@ -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. diff --git a/lib/ui/painting.dart b/lib/ui/painting.dart index 449d11c171445..cfafb039c428f 100644 --- a/lib/ui/painting.dart +++ b/lib/ui/painting.dart @@ -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. @@ -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; diff --git a/lib/ui/text.dart b/lib/ui/text.dart index 61eaf481a89b2..411e2054d52eb 100644 --- a/lib/ui/text.dart +++ b/lib/ui/text.dart @@ -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