Incorporate compat info changes into flutter engine

Changes related to compatibility info require changes in
Flutter engine libraries. This CL adds null-asserts wherever
necessary to maintain behavior and adds some small modifications
to handle the change in nullability. Warnings about unnecessary
null assertions are disabled temporarily in this CL as well.

Original issue: dart-lang/sdk#41905

lib/web_ui/analysis_options.yaml

@@ -16,8 +16,9 @@ analyzer:
 
 linter:
   rules:
-    - always_declare_return_types
-    - always_put_control_body_on_new_line
+    always_declare_return_types: true
+    always_put_control_body_on_new_line: true
+    unnecessary_non_null_assertion: false
     # TODO(uncomment) - always_specify_types
     # TODO(uncomment) - annotate_overrides
     # TODO(uncomment) - avoid_classes_with_only_static_members

lib/web_ui/lib/src/engine/assets.dart

@@ -64,7 +64,7 @@ class AssetManager {
               .warn('Asset manifest does not exist at `$url` – ignoring.');
           return Uint8List.fromList(utf8.encode('{}')).buffer.asByteData();
         }
-        throw AssetManagerException(url, target.status);
+        throw AssetManagerException(url, target.status!);
       }
 
       html.window.console.warn('Caught ProgressEvent with target: $target');

lib/web_ui/lib/src/engine/bitmap_canvas.dart

@@ -364,7 +364,7 @@ class BitmapCanvas extends EngineCanvas {
   }
 
   html.ImageElement _reuseOrCreateImage(HtmlImage htmlImage) {
-    final String cacheKey = htmlImage.imgElement.src;
+    final String cacheKey = htmlImage.imgElement.src!;
     if (_elementCache != null) {
       html.ImageElement? imageElement = _elementCache!.reuse(cacheKey) as html.ImageElement?;
       if (imageElement != null) {
@@ -674,7 +674,7 @@ class BitmapCanvas extends EngineCanvas {
       for (int i = 0; i < len; i++) {
         final String char = line.displayText![i];
         ctx!.fillText(char, x, y);
-        x += letterSpacing + ctx.measureText(char).width;
+        x += letterSpacing + ctx.measureText(char).width!;
       }
     }
   }

lib/web_ui/lib/src/engine/browser_detection.dart

@@ -115,7 +115,7 @@ OperatingSystem get operatingSystem {
 OperatingSystem? debugOperatingSystemOverride;
 
 OperatingSystem _detectOperatingSystem() {
-  final String platform = html.window.navigator.platform;
+  final String platform = html.window.navigator.platform!;
   final String userAgent = html.window.navigator.userAgent;
 
   if (platform.startsWith('Mac')) {

lib/web_ui/lib/src/engine/browser_location.dart

@@ -176,10 +176,10 @@ class BrowserPlatformLocation extends PlatformLocation {
   }
 
   @override
-  String get pathname => _location.pathname;
+  String get pathname => _location.pathname!;
 
   @override
-  String get search => _location.search;
+  String get search => _location.search!;
 
   @override
   String get hash => _location.hash;

lib/web_ui/lib/src/engine/clipboard.dart

@@ -109,7 +109,7 @@ class ClipboardAPICopyStrategy implements CopyToClipboardStrategy {
   @override
   Future<bool> setData(String? text) async {
     try {
-      await html.window.navigator.clipboard.writeText(text!);
+      await html.window.navigator.clipboard!.writeText(text!);
     } catch (error) {
       print('copy is not successful $error');
       return Future.value(false);
@@ -127,7 +127,7 @@ class ClipboardAPICopyStrategy implements CopyToClipboardStrategy {
 class ClipboardAPIPasteStrategy implements PasteFromClipboardStrategy {
   @override
   Future<String> getData() async {
-    return html.window.navigator.clipboard.readText();
+    return html.window.navigator.clipboard!.readText();
   }
 }
 

lib/web_ui/lib/src/engine/dom_renderer.dart

@@ -420,7 +420,7 @@ flt-glass-pane * {
       // Firefox returns correct values for innerHeight, innerWidth.
       // Firefox also triggers html.window.onResize therefore we don't need this
       // timer setup for Firefox.
-      final int initialInnerWidth = html.window.innerWidth;
+      final int initialInnerWidth = html.window.innerWidth!;
       // Counts how many times we checked screen size. We check up to 5 times.
       int checkCount = 0;
       Timer.periodic(const Duration(milliseconds: 100), (Timer t) {
@@ -534,10 +534,10 @@ flt-glass-pane * {
   ///
   /// See w3c screen api: https://www.w3.org/TR/screen-orientation/
   Future<bool> setPreferredOrientation(List<dynamic>? orientations) {
-    final html.Screen screen = html.window.screen;
+    final html.Screen screen = html.window.screen!;
     if (!_unsafeIsNull(screen)) {
       final html.ScreenOrientation screenOrientation =
-          screen.orientation;
+          screen.orientation!;
       if (!_unsafeIsNull(screenOrientation)) {
         if (orientations!.isEmpty) {
           screenOrientation.unlock();

lib/web_ui/lib/src/engine/keyboard.dart

@@ -89,7 +89,7 @@ class Keyboard {
       event.preventDefault();
     }
 
-    final String timerKey = keyboardEvent.code;
+    final String timerKey = keyboardEvent.code!;
 
     // Don't synthesize a keyup event for modifier keys because the browser always
     // sends a keyup event for those.
@@ -181,7 +181,7 @@ int _getMetaState(html.KeyboardEvent event) {
 /// Modifier keys are shift, alt, ctrl and meta/cmd/win. These are the keys used
 /// to perform keyboard shortcuts (e.g. `cmd+c`, `cmd+l`).
 bool _isModifierKey(html.KeyboardEvent event) {
-  final String key = event.key;
+  final String key = event.key!;
   return key == 'Meta' || key == 'Shift' || key == 'Alt' || key == 'Control';
 }
 

lib/web_ui/lib/src/engine/pointer_binding.dart

@@ -257,13 +257,13 @@ mixin _WheelEventListenerMixin on _BaseAdapter {
     _pointerDataConverter.convert(
       data,
       change: ui.PointerChange.hover,
-      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp),
+      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
       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,
-      buttons: event.buttons,
+      buttons: event.buttons!,
       pressure: 1.0,
       pressureMin: 0.0,
       pressureMax: 1.0,
@@ -444,23 +444,23 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
   @override
   void setup() {
     _addPointerEventListener('pointerdown', (html.PointerEvent event) {
-      final int device = event.pointerId;
+      final int device = event.pointerId!;
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _SanitizedDetails details =
         _ensureSanitizer(device).sanitizeDownEvent(
           button: event.button,
-          buttons: event.buttons,
+          buttons: event.buttons!,
         );
       _convertEventsToPointerData(data: pointerData, event: event, details: details);
       _callback(pointerData);
     });
 
     _addPointerEventListener('pointermove', (html.PointerEvent event) {
-      final int device = event.pointerId;
+      final int device = event.pointerId!;
       final _ButtonSanitizer sanitizer = _ensureSanitizer(device);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final Iterable<_SanitizedDetails> detailsList = _expandEvents(event).map(
-        (html.PointerEvent expandedEvent) => sanitizer.sanitizeMoveEvent(buttons: expandedEvent.buttons),
+        (html.PointerEvent expandedEvent) => sanitizer.sanitizeMoveEvent(buttons: expandedEvent.buttons!),
       );
       for (_SanitizedDetails details in detailsList) {
         _convertEventsToPointerData(data: pointerData, event: event, details: details);
@@ -469,7 +469,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     }, acceptOutsideGlasspane: true);
 
     _addPointerEventListener('pointerup', (html.PointerEvent event) {
-      final int device = event.pointerId;
+      final int device = event.pointerId!;
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _SanitizedDetails? details = _getSanitizer(device).sanitizeUpEvent();
       _removePointerIfUnhoverable(event);
@@ -482,7 +482,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     // A browser fires cancel event if it concludes the pointer will no longer
     // be able to generate events (example: device is deactivated)
     _addPointerEventListener('pointercancel', (html.PointerEvent event) {
-      final int device = event.pointerId;
+      final int device = event.pointerId!;
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
       final _SanitizedDetails details = _getSanitizer(device).sanitizeCancelEvent();
       _removePointerIfUnhoverable(event);
@@ -512,13 +512,13 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     assert(data != null); // ignore: unnecessary_null_comparison
     assert(event != null); // ignore: unnecessary_null_comparison
     assert(details != null); // ignore: unnecessary_null_comparison
-    final ui.PointerDeviceKind kind = _pointerTypeToDeviceKind(event.pointerType);
+    final ui.PointerDeviceKind kind = _pointerTypeToDeviceKind(event.pointerType!);
     // We force `device: _mouseDeviceId` on mouse pointers because Wheel events
     // might come before any PointerEvents, and since wheel events don't contain
     // pointerId we always assign `device: _mouseDeviceId` to them.
-    final int device = kind == ui.PointerDeviceKind.mouse ? _mouseDeviceId : event.pointerId;
+    final int device = kind == ui.PointerDeviceKind.mouse ? _mouseDeviceId : event.pointerId!;
     final double tilt = _computeHighestTilt(event);
-    final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp);
+    final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
     _pointerDataConverter.convert(
       data,
       change: details.change,
@@ -566,7 +566,7 @@ class _PointerAdapter extends _BaseAdapter with _WheelEventListenerMixin {
 
   /// Tilt angle is -90 to + 90. Take maximum deflection and convert to radians.
   double _computeHighestTilt(html.PointerEvent e) =>
-      (e.tiltX.abs() > e.tiltY.abs() ? e.tiltX : e.tiltY).toDouble() /
+      (e.tiltX!.abs() > e.tiltY!.abs() ? e.tiltX : e.tiltY)!.toDouble() /
       180.0 *
       math.pi;
 }
@@ -596,12 +596,12 @@ class _TouchAdapter extends _BaseAdapter {
   @override
   void setup() {
     _addTouchEventListener('touchstart', (html.TouchEvent event) {
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp);
+      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (html.Touch touch in event.changedTouches) {
-        final nowPressed = _isTouchPressed(touch.identifier);
+      for (html.Touch touch in event.changedTouches!) {
+        final nowPressed = _isTouchPressed(touch.identifier!);
         if (!nowPressed) {
-          _pressTouch(touch.identifier);
+          _pressTouch(touch.identifier!);
           _convertEventToPointerData(
             data: pointerData,
             change: ui.PointerChange.down,
@@ -616,10 +616,10 @@ class _TouchAdapter extends _BaseAdapter {
 
     _addTouchEventListener('touchmove', (html.TouchEvent event) {
       event.preventDefault(); // Prevents standard overscroll on iOS/Webkit.
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp);
+      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (html.Touch touch in event.changedTouches) {
-        final nowPressed = _isTouchPressed(touch.identifier);
+      for (html.Touch touch in event.changedTouches!) {
+        final nowPressed = _isTouchPressed(touch.identifier!);
         if (nowPressed) {
           _convertEventToPointerData(
             data: pointerData,
@@ -637,12 +637,12 @@ class _TouchAdapter extends _BaseAdapter {
       // On Safari Mobile, the keyboard does not show unless this line is
       // added.
       event.preventDefault();
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp);
+      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (html.Touch touch in event.changedTouches) {
-        final nowPressed = _isTouchPressed(touch.identifier);
+      for (html.Touch touch in event.changedTouches!) {
+        final nowPressed = _isTouchPressed(touch.identifier!);
         if (nowPressed) {
-          _unpressTouch(touch.identifier);
+          _unpressTouch(touch.identifier!);
           _convertEventToPointerData(
             data: pointerData,
             change: ui.PointerChange.up,
@@ -656,12 +656,12 @@ class _TouchAdapter extends _BaseAdapter {
     });
 
     _addTouchEventListener('touchcancel', (html.TouchEvent event) {
-      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp);
+      final Duration timeStamp = _BaseAdapter._eventTimeStampToDuration(event.timeStamp!);
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      for (html.Touch touch in event.changedTouches) {
-        final nowPressed = _isTouchPressed(touch.identifier);
+      for (html.Touch touch in event.changedTouches!) {
+        final nowPressed = _isTouchPressed(touch.identifier!);
         if (nowPressed) {
-          _unpressTouch(touch.identifier);
+          _unpressTouch(touch.identifier!);
           _convertEventToPointerData(
             data: pointerData,
             change: ui.PointerChange.cancel,
@@ -688,7 +688,7 @@ class _TouchAdapter extends _BaseAdapter {
       timeStamp: timeStamp,
       kind: ui.PointerDeviceKind.touch,
       signalKind: ui.PointerSignalKind.none,
-      device: touch.identifier,
+      device: touch.identifier!,
       physicalX: touch.client.x * ui.window.devicePixelRatio as double,
       physicalY: touch.client.y * ui.window.devicePixelRatio as double,
       buttons: pressed ? _kPrimaryMouseButton : 0,
@@ -746,15 +746,15 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
       final _SanitizedDetails sanitizedDetails =
         _sanitizer.sanitizeDownEvent(
           button: event.button,
-          buttons: event.buttons,
+          buttons: event.buttons!,
         );
       _convertEventsToPointerData(data: pointerData, event: event, details: sanitizedDetails);
       _callback(pointerData);
     });
 
     _addMouseEventListener('mousemove', (html.MouseEvent event) {
       final List<ui.PointerData> pointerData = <ui.PointerData>[];
-      final _SanitizedDetails sanitizedDetails = _sanitizer.sanitizeMoveEvent(buttons: event.buttons);
+      final _SanitizedDetails sanitizedDetails = _sanitizer.sanitizeMoveEvent(buttons: event.buttons!);
       _convertEventsToPointerData(data: pointerData, event: event, details: sanitizedDetails);
       _callback(pointerData);
     }, acceptOutsideGlasspane: true);
@@ -764,7 +764,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
       final bool isEndOfDrag = event.buttons == 0;
       final _SanitizedDetails sanitizedDetails = isEndOfDrag ?
         _sanitizer.sanitizeUpEvent()! :
-        _sanitizer.sanitizeMoveEvent(buttons: event.buttons);
+        _sanitizer.sanitizeMoveEvent(buttons: event.buttons!);
       _convertEventsToPointerData(data: pointerData, event: event, details: sanitizedDetails);
       _callback(pointerData);
     }, acceptOutsideGlasspane: true);
@@ -794,7 +794,7 @@ class _MouseAdapter extends _BaseAdapter with _WheelEventListenerMixin {
     _pointerDataConverter.convert(
       data,
       change: details.change,
-      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp),
+      timeStamp: _BaseAdapter._eventTimeStampToDuration(event.timeStamp!),
       kind: ui.PointerDeviceKind.mouse,
       signalKind: ui.PointerSignalKind.none,
       device: _mouseDeviceId,

lib/web_ui/lib/src/engine/semantics/incrementable.dart

@@ -45,11 +45,11 @@ class Incrementable extends RoleManager {
     _element.setAttribute('role', 'slider');
 
     _element.addEventListener('change', (_) {
-      if (_element.disabled) {
+      if (_element.disabled!) {
         return;
       }
       _pendingResync = true;
-      final int newInputValue = int.parse(_element.value);
+      final int newInputValue = int.parse(_element.value!);
       if (newInputValue > _currentSurrogateValue) {
         _currentSurrogateValue += 1;
         window.invokeOnSemanticsAction(
@@ -84,7 +84,7 @@ class Incrementable extends RoleManager {
 
   void _enableBrowserGestureHandling() {
     assert(semanticsObject.owner.gestureMode == GestureMode.browserGestures);
-    if (!_element.disabled) {
+    if (!_element.disabled!) {
       return;
     }
     _element.disabled = false;
@@ -123,7 +123,7 @@ class Incrementable extends RoleManager {
   }
 
   void _disableBrowserGestureHandling() {
-    if (_element.disabled) {
+    if (_element.disabled!) {
       return;
     }
     _element.disabled = true;

lib/web_ui/lib/src/engine/semantics/semantics_helper.dart

@@ -331,7 +331,7 @@ class MobileSemanticsEnabler extends SemanticsEnabler {
         case 'touchstart':
         case 'touchend':
           final html.TouchEvent touch = event as html.TouchEvent;
-          activationPoint = touch.changedTouches.first.client;
+          activationPoint = touch.changedTouches!.first.client;
           break;
         default:
           // The event is not relevant, forward to framework as normal.

lib/web_ui/lib/src/engine/semantics/text_field.dart

@@ -165,17 +165,17 @@ class TextField extends RoleManager {
     _textFieldElement.addEventListener('touchstart', (html.Event event) {
       textEditing.useCustomEditableElement(textEditingElement);
       final html.TouchEvent touchEvent = event as html.TouchEvent;
-      lastTouchStartOffsetX = touchEvent.changedTouches.last.client.x;
-      lastTouchStartOffsetY = touchEvent.changedTouches.last.client.y;
+      lastTouchStartOffsetX = touchEvent.changedTouches!.last.client.x;
+      lastTouchStartOffsetY = touchEvent.changedTouches!.last.client.y;
     }, true);
 
     _textFieldElement.addEventListener('touchend', (html.Event event) {
       final html.TouchEvent touchEvent = event as html.TouchEvent;
 
       if (lastTouchStartOffsetX != null) {
         assert(lastTouchStartOffsetY != null);
-        final num offsetX = touchEvent.changedTouches.last.client.x;
-        final num offsetY = touchEvent.changedTouches.last.client.y;
+        final num offsetX = touchEvent.changedTouches!.last.client.x;
+        final num offsetY = touchEvent.changedTouches!.last.client.y;
 
         // This should match the similar constant define in:
         //

lib/web_ui/lib/src/engine/surface/scene.dart

@@ -38,8 +38,8 @@ class PersistedScene extends PersistedContainerSurface {
     // TODO(yjbanov): in the add2app scenario where we might be hosted inside
     //                a custom element, this will be different. We will need to
     //                update this code when we add add2app support.
-    final double screenWidth = html.window.innerWidth.toDouble();
-    final double screenHeight = html.window.innerHeight.toDouble();
+    final double screenWidth = html.window.innerWidth!.toDouble();
+    final double screenHeight = html.window.innerHeight!.toDouble();
     _localClipBounds = ui.Rect.fromLTRB(0, 0, screenWidth, screenHeight);
     _localTransformInverse = Matrix4.identity();
     _projectedClip = null;