Roll CanvasKit to 0.22 (flutter#23348)

engine-flutter-autoroll · Jan 12, 2021 · 62a1e8e · 62a1e8e
1 parent 379e7e9
commit 62a1e8e
Show file tree

Hide file tree

Showing 10 changed files with 220 additions and 225 deletions.
diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvas.dart b/lib/web_ui/lib/src/engine/canvaskit/canvas.dart
@@ -70,7 +70,7 @@ class CkCanvas {
     CkImage atlas,
     Float32List rstTransforms,
     Float32List rects,
-    List<Float32List>? colors,
+    Uint32List? colors,
     ui.BlendMode blendMode,
   ) {
     skCanvas.drawAtlas(
@@ -192,10 +192,10 @@ class CkCanvas {
     skCanvas.drawRect(toSkRect(rect), paint.skiaObject);
   }
 
-  void drawShadow(CkPath path, ui.Color color, double elevation,
-      bool transparentOccluder) {
-    drawSkShadow(skCanvas, path, color, elevation,
-        transparentOccluder, ui.window.devicePixelRatio);
+  void drawShadow(
+      CkPath path, ui.Color color, double elevation, bool transparentOccluder) {
+    drawSkShadow(skCanvas, path, color, elevation, transparentOccluder,
+        ui.window.devicePixelRatio);
   }
 
   void drawVertices(
@@ -237,7 +237,8 @@ class CkCanvas {
   }
 
   void saveLayerWithFilter(ui.Rect bounds, ui.ImageFilter filter) {
-    final _CkManagedSkImageFilterConvertible convertible = filter as _CkManagedSkImageFilterConvertible;
+    final _CkManagedSkImageFilterConvertible convertible =
+        filter as _CkManagedSkImageFilterConvertible;
     return skCanvas.saveLayer(
       null,
       toSkRect(bounds),
@@ -267,8 +268,8 @@ class CkCanvas {
 
 class RecordingCkCanvas extends CkCanvas {
   RecordingCkCanvas(SkCanvas skCanvas, ui.Rect bounds)
-    : pictureSnapshot = CkPictureSnapshot(bounds),
-      super(skCanvas);
+      : pictureSnapshot = CkPictureSnapshot(bounds),
+        super(skCanvas);
 
   @override
   final CkPictureSnapshot pictureSnapshot;
@@ -310,7 +311,8 @@ class RecordingCkCanvas extends CkCanvas {
     CkPaint paint,
   ) {
     super.drawArc(oval, startAngle, sweepAngle, useCenter, paint);
-    _addCommand(CkDrawArcCommand(oval, startAngle, sweepAngle, useCenter, paint));
+    _addCommand(
+        CkDrawArcCommand(oval, startAngle, sweepAngle, useCenter, paint));
   }
 
   @override
@@ -319,11 +321,12 @@ class RecordingCkCanvas extends CkCanvas {
     CkImage atlas,
     Float32List rstTransforms,
     Float32List rects,
-    List<Float32List>? colors,
+    Uint32List? colors,
     ui.BlendMode blendMode,
   ) {
     super.drawAtlasRaw(paint, atlas, rstTransforms, rects, colors, blendMode);
-    _addCommand(CkDrawAtlasCommand(paint, atlas, rstTransforms, rects, colors, blendMode));
+    _addCommand(CkDrawAtlasCommand(
+        paint, atlas, rstTransforms, rects, colors, blendMode));
   }
 
   @override
@@ -418,10 +421,11 @@ class RecordingCkCanvas extends CkCanvas {
   }
 
   @override
-  void drawShadow(CkPath path, ui.Color color, double elevation,
-      bool transparentOccluder) {
+  void drawShadow(
+      CkPath path, ui.Color color, double elevation, bool transparentOccluder) {
     super.drawShadow(path, color, elevation, transparentOccluder);
-    _addCommand(CkDrawShadowCommand(path, color, elevation, transparentOccluder));
+    _addCommand(
+        CkDrawShadowCommand(path, color, elevation, transparentOccluder));
   }
 
   @override
@@ -627,7 +631,7 @@ class CkTransformCommand extends CkPaintCommand {
   @override
   void apply(SkCanvas canvas) {
     canvas.concat(toSkMatrixFromFloat32(matrix4));
- }
+  }
 }
 
 class CkSkewCommand extends CkPaintCommand {
@@ -660,7 +664,8 @@ class CkClipRectCommand extends CkPaintCommand {
 }
 
 class CkDrawArcCommand extends CkPaintCommand {
-  CkDrawArcCommand(this.oval, this.startAngle, this.sweepAngle, this.useCenter, this.paint);
+  CkDrawArcCommand(
+      this.oval, this.startAngle, this.sweepAngle, this.useCenter, this.paint);
 
   final ui.Rect oval;
   final double startAngle;
@@ -682,13 +687,14 @@ class CkDrawArcCommand extends CkPaintCommand {
 }
 
 class CkDrawAtlasCommand extends CkPaintCommand {
-  CkDrawAtlasCommand(this.paint, this.atlas, this.rstTransforms, this.rects, this.colors, this.blendMode);
+  CkDrawAtlasCommand(this.paint, this.atlas, this.rstTransforms, this.rects,
+      this.colors, this.blendMode);
 
   final CkPaint paint;
   final CkImage atlas;
   final Float32List rstTransforms;
   final Float32List rects;
-  final List<Float32List>? colors;
+  final Uint32List? colors;
   final ui.BlendMode blendMode;
 
   @override
@@ -924,7 +930,7 @@ class CkDrawImageCommand extends CkPaintCommand {
   final CkPaint paint;
 
   CkDrawImageCommand(CkImage image, this.offset, this.paint)
-    : this.image = image.clone();
+      : this.image = image.clone();
 
   @override
   void apply(SkCanvas canvas) {
@@ -949,7 +955,7 @@ class CkDrawImageRectCommand extends CkPaintCommand {
   final CkPaint paint;
 
   CkDrawImageRectCommand(CkImage image, this.src, this.dst, this.paint)
-    : this.image = image.clone();
+      : this.image = image.clone();
 
   @override
   void apply(SkCanvas canvas) {
@@ -970,7 +976,7 @@ class CkDrawImageRectCommand extends CkPaintCommand {
 
 class CkDrawImageNineCommand extends CkPaintCommand {
   CkDrawImageNineCommand(CkImage image, this.center, this.dst, this.paint)
-    : this.image = image.clone();
+      : this.image = image.clone();
 
   final CkImage image;
   final ui.Rect center;
@@ -1061,7 +1067,8 @@ class CkSaveLayerWithFilterCommand extends CkPaintCommand {
 
   @override
   void apply(SkCanvas canvas) {
-    final _CkManagedSkImageFilterConvertible convertible = filter as _CkManagedSkImageFilterConvertible;
+    final _CkManagedSkImageFilterConvertible convertible =
+        filter as _CkManagedSkImageFilterConvertible;
     return canvas.saveLayer(
       null,
       toSkRect(bounds),