Skip to content

Commit

Permalink
Manual roll of Dart from 5ca1f32 to 551e405 (flutter#20758)
Browse files Browse the repository at this point in the history
dart-lang/sdk@551e405d0b Version 2.10.0-57.0.dev
 dart-lang/sdk@ce494e7910 Add test for inference solving T? = dynamic.
 dart-lang/sdk@0e1d32f10c [fuchsia][time] Use C11 timespec APIs for UTC time
 dart-lang/sdk@08dd4b1faa Null-safe numbers: implement static typing rules, hook up for binary operators.
 dart-lang/sdk@9be24ce946 [benchmark] Import MD5/SHA1/SHA256/SkeletalAnimation/SkeletalAnimationSIMD benchmarks from benchmarks-internal
 dart-lang/sdk@675891ae0c Issue 43152. Use existing LineInfo in newDiagnosticMessage().
 dart-lang/sdk@e868d3076c Issue 43151. Fix crash when a field shadows a super-interface method.
  • Loading branch information
a-siva authored Aug 25, 2020
1 parent 3fe49ec commit 04b0422
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 23 deletions.
2 changes: 1 addition & 1 deletion 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': '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
Expand Down
12 changes: 11 additions & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: ab76ce6d3ea560de10d3451aa8438b6a
Signature: 8f2bb3254e69af1ec4d5371fa29ad12e

UNUSED LICENSES:

Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions lib/web_ui/lib/src/engine/pointer_binding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions lib/web_ui/lib/src/engine/semantics/semantics_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,11 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
final html.Rectangle<num> 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;
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/text/measurement.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/lib/src/engine/text/ruler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
));
Expand Down
10 changes: 5 additions & 5 deletions lib/web_ui/lib/src/engine/window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/ui/lerp.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 04b0422

Please sign in to comment.