From b6aadb040696441dc84e38b44dc3e50e26963aaa Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Fri, 24 Jul 2020 12:37:35 -0700
Subject: [PATCH] [null-safety] fix real type failures in web engine
 (flutter/engine#20010)

remove extra null checks
---
 .../lib/web_ui/lib/src/engine/compositor/path_metrics.dart      | 2 +-
 .../flutter/lib/web_ui/lib/src/engine/compositor/surface.dart   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
index 32a43fa18a3..af21dd6e9ac 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
@@ -13,7 +13,7 @@ class CkPathMetrics extends IterableBase<ui.PathMetric>
 
   /// The [CkPath.isEmpty] case is special-cased to avoid booting the WASM machinery just to find out there are no contours.
   @override
-  Iterator<ui.PathMetric> get iterator => _path.isEmpty! ? const CkPathMetricIteratorEmpty._() : CkContourMeasureIter(_path, _forceClosed);
+  Iterator<ui.PathMetric> get iterator => _path.isEmpty ? const CkPathMetricIteratorEmpty._() : CkContourMeasureIter(_path, _forceClosed);
 }
 
 class CkContourMeasureIter implements Iterator<ui.PathMetric> {
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart
index e0047ca4c70..4a104905bef 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/compositor/surface.dart
@@ -160,7 +160,7 @@ class Surface {
         return _makeSoftwareCanvasSurface(htmlCanvas);
       }
 
-      return CkSurface(skSurface!, _grContext, glContext);
+      return CkSurface(skSurface, _grContext, glContext);
     }
   }