Change Flutter APIs to use spans (flutter#177272)

Some old APIs are currently guarded by `SK_SUPPORT_UNSPANNED_APIS` and
Skia plans to delete them (for example in this
[CL](https://skia-review.googlesource.com/c/skia/+/1073616)). This
updates Flutter calls to use the new APIs (by wrapping the pointers and
counts together) and removes the define to avoid backsliding.

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [ ] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

Author: kjlubick

engine/src/flutter/display_list/benchmarking/dl_transform_benchmarks.cc

@@ -213,8 +213,8 @@ class SkMatrixAdapter : public SkiaAdapterBase {
                        TestPoint out[],
                        int n) const override {
     static_assert(sizeof(TestPoint) == sizeof(SkPoint));
-    transform.sk_matrix.mapPoints(reinterpret_cast<SkPoint*>(out),
-                                  reinterpret_cast<const SkPoint*>(in), n);
+    transform.sk_matrix.mapPoints({reinterpret_cast<SkPoint*>(out), n},
+                                  {reinterpret_cast<const SkPoint*>(in), n});
   }
 
   void TransformRectFast(const TestTransform& transform,
@@ -234,7 +234,7 @@ class SkMatrixAdapter : public SkiaAdapterBase {
     SkPoint3 homogenous[4];
     SkPoint corners[4];
     rect.sk_rect.toQuad(corners);
-    transform.sk_matrix.mapHomogeneousPoints(homogenous, corners, 4);
+    transform.sk_matrix.mapPointsToHomogeneous({homogenous, 4}, {corners, 4});
     int count = 0;
     for (SkPoint3 hpt : homogenous) {
       if (hpt.fZ <= 0) {
@@ -299,8 +299,9 @@ class SkM44Adapter : public SkiaAdapterBase {
                        TestPoint out[],
                        int n) const override {
     static_assert(sizeof(TestPoint) == sizeof(SkPoint));
-    transform.sk_m44.asM33().mapPoints(reinterpret_cast<SkPoint*>(out),
-                                       reinterpret_cast<const SkPoint*>(in), n);
+    transform.sk_m44.asM33().mapPoints(
+        {reinterpret_cast<SkPoint*>(out), n},
+        {reinterpret_cast<const SkPoint*>(in), n});
   }
 
   void TransformRectFast(const TestTransform& transform,
@@ -328,7 +329,8 @@ class SkM44Adapter : public SkiaAdapterBase {
     SkPoint3 homogenous[4];
     SkPoint corners[4];
     rect.sk_rect.toQuad(corners);
-    transform.sk_m44.asM33().mapHomogeneousPoints(homogenous, corners, 4);
+    transform.sk_m44.asM33().mapPointsToHomogeneous({homogenous, 4},
+                                                    {corners, 4});
     int count = 0;
     for (SkPoint3 hpt : homogenous) {
       if (hpt.fZ <= 0) {

engine/src/flutter/display_list/geometry/dl_path.cc

@@ -94,8 +94,8 @@ DlPath DlPath::MakePoly(const DlPoint pts[],
                         int count,
                         bool close,
                         DlPathFillType fill_type) {
-  return DlPath(
-      SkPath::Polygon(ToSkPoints(pts), count, close, ToSkFillType(fill_type)));
+  return DlPath(SkPath::Polygon({ToSkPoints(pts), count}, close,
+                                ToSkFillType(fill_type)));
 }
 
 DlPath DlPath::MakeArc(const DlRect& bounds,

engine/src/flutter/display_list/skia/dl_sk_canvas.cc

@@ -214,7 +214,7 @@ void DlSkCanvasAdapter::DrawDashedLine(const DlPoint& p0,
                                        const DlPaint& paint) {
   SkPaint dashed_paint = ToStrokedSk(paint);
   SkScalar intervals[2] = {on_length, off_length};
-  dashed_paint.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0.0f));
+  dashed_paint.setPathEffect(SkDashPathEffect::Make({intervals, 2}, 0.0f));
   delegate_->drawLine(ToSkPoint(p0), ToSkPoint(p1), dashed_paint);
 }
 
@@ -266,7 +266,8 @@ void DlSkCanvasAdapter::DrawPoints(DlPointMode mode,
                                    uint32_t count,
                                    const DlPoint pts[],
                                    const DlPaint& paint) {
-  delegate_->drawPoints(ToSk(mode), count, ToSkPoints(pts), ToStrokedSk(paint));
+  delegate_->drawPoints(ToSk(mode), {ToSkPoints(pts), count},
+                        ToStrokedSk(paint));
 }
 
 void DlSkCanvasAdapter::DrawVertices(
@@ -325,9 +326,10 @@ void DlSkCanvasAdapter::DrawAtlas(const sk_sp<DlImage>& atlas,
   for (int i = 0; i < count; ++i) {
     sk_colors.push_back(colors[i].argb());
   }
-  delegate_->drawAtlas(sk_image.get(), ToSk(xform), ToSkRects(tex),
-                       sk_colors.data(), count, ToSk(mode), ToSk(sampling),
-                       ToSkRect(cullRect), sk_paint());
+  delegate_->drawAtlas(sk_image.get(), {ToSk(xform), count},
+                       {ToSkRects(tex), count}, {sk_colors.data(), count},
+                       ToSk(mode), ToSk(sampling), ToSkRect(cullRect),
+                       sk_paint());
 }
 
 void DlSkCanvasAdapter::DrawDisplayList(const sk_sp<DisplayList> display_list,

engine/src/flutter/display_list/skia/dl_sk_dispatcher.cc

@@ -181,7 +181,7 @@ void DlSkCanvasDispatcher::drawDashedLine(const DlPoint& p0,
                                           DlScalar off_length) {
   SkPaint dash_paint = paint();
   SkScalar intervals[] = {on_length, off_length};
-  dash_paint.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0.0f));
+  dash_paint.setPathEffect(SkDashPathEffect::Make({intervals, 2}, 0.0f));
   canvas_->drawLine(ToSkPoint(p0), ToSkPoint(p1), dash_paint);
 }
 void DlSkCanvasDispatcher::drawRect(const DlRect& rect) {
@@ -218,7 +218,7 @@ void DlSkCanvasDispatcher::drawArc(const DlRect& bounds,
 void DlSkCanvasDispatcher::drawPoints(DlPointMode mode,
                                       uint32_t count,
                                       const DlPoint pts[]) {
-  canvas_->drawPoints(ToSk(mode), count, ToSkPoints(pts), paint());
+  canvas_->drawPoints(ToSk(mode), {ToSkPoints(pts), count}, paint());
 }
 void DlSkCanvasDispatcher::drawVertices(
     const std::shared_ptr<DlVertices>& vertices,
@@ -280,9 +280,15 @@ void DlSkCanvasDispatcher::drawAtlas(const sk_sp<DlImage> atlas,
       sk_colors.push_back(colors[i].argb());
     }
   }
-  canvas_->drawAtlas(skia_atlas.get(), ToSk(xform), ToSkRects(tex),
-                     sk_colors.empty() ? nullptr : sk_colors.data(), count,
-                     ToSk(mode), ToSk(sampling), ToSkRect(cullRect),
+  SkSpan<const SkColor> colorSpan;
+  if (!colors) {
+    colorSpan = {nullptr, 0};
+  } else {
+    colorSpan = {sk_colors.data(), count};
+  }
+  canvas_->drawAtlas(skia_atlas.get(), {ToSk(xform), count},
+                     {ToSkRects(tex), count}, colorSpan, ToSk(mode),
+                     ToSk(sampling), ToSkRect(cullRect),
                      safe_paint(render_with_attributes));
 }
 void DlSkCanvasDispatcher::drawDisplayList(

engine/src/flutter/display_list/testing/dl_rendering_unittests.cc

@@ -3087,7 +3087,7 @@ TEST_F(DisplayListRendering, DrawDiagonalDashedLines) {
             SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
             DlScalar intervals[2] = {25.0f, 5.0f};
-            p.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0.0f));
+            p.setPathEffect(SkDashPathEffect::Make({intervals, 2}, 0.0f));
             ctx.canvas->drawLine(ToSkPoint(p1), ToSkPoint(p2), p);
             ctx.canvas->drawLine(ToSkPoint(p3), ToSkPoint(p4), p);
             ctx.canvas->drawLine(ToSkPoint(p5), ToSkPoint(p6), p);
@@ -3299,7 +3299,7 @@ TEST_F(DisplayListRendering, DrawPointsAsPoints) {
             SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
             auto mode = SkCanvas::kPoints_PointMode;
-            ctx.canvas->drawPoints(mode, count, ToSkPoints(points), p);
+            ctx.canvas->drawPoints(mode, {ToSkPoints(points), count}, p);
           },
           [=](const DlRenderContext& ctx) {
             auto mode = DlPointMode::kPoints;
@@ -3351,7 +3351,7 @@ TEST_F(DisplayListRendering, DrawPointsAsLines) {
             SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
             auto mode = SkCanvas::kLines_PointMode;
-            ctx.canvas->drawPoints(mode, count, ToSkPoints(points), p);
+            ctx.canvas->drawPoints(mode, {ToSkPoints(points), count}, p);
           },
           [=](const DlRenderContext& ctx) {
             auto mode = DlPointMode::kLines;
@@ -3386,7 +3386,7 @@ TEST_F(DisplayListRendering, DrawPointsAsPolygon) {
             SkPaint p = ctx.paint;
             p.setStyle(SkPaint::kStroke_Style);
             auto mode = SkCanvas::kPolygon_PointMode;
-            ctx.canvas->drawPoints(mode, count1, ToSkPoints(points1), p);
+            ctx.canvas->drawPoints(mode, {ToSkPoints(points1), count1}, p);
           },
           [=](const DlRenderContext& ctx) {
             auto mode = DlPointMode::kPolygon;
@@ -3695,9 +3695,10 @@ TEST_F(DisplayListRendering, DrawAtlasNearest) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
           [=](const SkRenderContext& ctx) {
-            ctx.canvas->drawAtlas(ctx.image.get(), sk_xform, ToSkRects(tex),
-                                  sk_colors, 4, SkBlendMode::kSrcOver,
-                                  sk_sampling, nullptr, &ctx.paint);
+            ctx.canvas->drawAtlas(ctx.image.get(), {sk_xform, 4},
+                                  {ToSkRects(tex), 4}, {sk_colors, 4},
+                                  SkBlendMode::kSrcOver, sk_sampling, nullptr,
+                                  &ctx.paint);
           },
           [=](const DlRenderContext& ctx) {
             ctx.canvas->DrawAtlas(ctx.image, dl_xform, tex, dl_colors, 4,
@@ -3754,9 +3755,10 @@ TEST_F(DisplayListRendering, DrawAtlasNearestNoPaint) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
           [=](const SkRenderContext& ctx) {
-            ctx.canvas->drawAtlas(ctx.image.get(), sk_xform, ToSkRects(tex),
-                                  sk_colors, 4, SkBlendMode::kSrcOver,
-                                  sk_sampling, nullptr, nullptr);
+            ctx.canvas->drawAtlas(ctx.image.get(), {sk_xform, 4},
+                                  {ToSkRects(tex), 4}, {sk_colors, 4},
+                                  SkBlendMode::kSrcOver, sk_sampling, nullptr,
+                                  nullptr);
           },
           [=](const DlRenderContext& ctx) {
             ctx.canvas->DrawAtlas(ctx.image, dl_xform, tex, dl_colors, 4,
@@ -3813,9 +3815,10 @@ TEST_F(DisplayListRendering, DrawAtlasLinear) {
   CanvasCompareTester::RenderAll(  //
       TestParameters(
           [=](const SkRenderContext& ctx) {
-            ctx.canvas->drawAtlas(ctx.image.get(), sk_xform, ToSkRects(tex),
-                                  sk_colors, 2, SkBlendMode::kSrcOver,
-                                  sk_sampling, nullptr, &ctx.paint);
+            ctx.canvas->drawAtlas(ctx.image.get(), {sk_xform, 2},
+                                  {ToSkRects(tex), 2}, {sk_colors, 2},
+                                  SkBlendMode::kSrcOver, sk_sampling, nullptr,
+                                  &ctx.paint);
           },
           [=](const DlRenderContext& ctx) {
             ctx.canvas->DrawAtlas(ctx.image, dl_xform, tex, dl_colors, 2,

engine/src/flutter/impeller/typographer/backends/skia/typographer_context_skia.cc

@@ -248,9 +248,9 @@ static void DrawGlyph(SkCanvas* canvas,
   canvas->save();
   Point subpixel_offset = SubpixelPositionToPoint(glyph.subpixel_offset);
   canvas->translate(subpixel_offset.x, subpixel_offset.y);
-  canvas->drawGlyphs(1u,         // count
-                     &glyph_id,  // glyphs
-                     &position,  // positions
+  // Draw a single glyph in the bounds
+  canvas->drawGlyphs({&glyph_id, 1u},  // glyphs
+                     {&position, 1u},  // positions
                      SkPoint::Make(-scaled_bounds.GetLeft(),
                                    -scaled_bounds.GetTop()),  // origin
                      sk_font,                                 // font
@@ -406,7 +406,8 @@ static Rect ComputeGlyphSize(const SkFont& font,
     glyph_paint.setStrokeJoin(ToSkiaJoin(glyph.properties->stroke->join));
     glyph_paint.setStrokeMiter(glyph.properties->stroke->miter_limit);
   }
-  font.getBounds(&glyph.glyph.index, 1, &scaled_bounds, &glyph_paint);
+  // Get bounds for a single glyph
+  font.getBounds({&glyph.glyph.index, 1}, {&scaled_bounds, 1}, &glyph_paint);
 
   // Expand the bounds of glyphs at subpixel offsets by 2 in the x direction.
   Scalar adjustment = 0.0;

engine/src/flutter/impeller/typographer/typographer_unittests.cc

@@ -478,8 +478,10 @@ TEST_P(TypographerTest, GlyphAtlasTextureWillGrowTilMaxTextureSize) {
     auto add_char = [&](const SkFont& sk_font, char c) {
       int count = sk_font.countText(&c, 1, SkTextEncoding::kUTF8);
       auto buffer = builder.allocRunPos(sk_font, count);
-      sk_font.textToGlyphs(&c, 1, SkTextEncoding::kUTF8, buffer.glyphs, count);
-      sk_font.getPos(buffer.glyphs, count, buffer.points(), {0, 0});
+      sk_font.textToGlyphs(&c, 1, SkTextEncoding::kUTF8,
+                           {buffer.glyphs, count});
+      sk_font.getPos({buffer.glyphs, count}, {buffer.points(), count},
+                     {0, 0} /*=origin*/);
     };
 
     SkFont sk_font = flutter::testing::CreateTestFontOfSize(50 + i);

engine/src/flutter/lib/ui/painting/path.cc

@@ -194,8 +194,10 @@ void CanvasPath::addArc(double left,
 }
 
 void CanvasPath::addPolygon(const tonic::Float32List& points, bool close) {
-  sk_path_.addPoly(reinterpret_cast<const SkPoint*>(points.data()),
-                   points.num_elements() / 2, close);
+  SkSpan<const SkPoint> ptsSpan = {
+      reinterpret_cast<const SkPoint*>(points.data()),
+      points.num_elements() / 2};
+  sk_path_.addPoly(ptsSpan, close);
   resetVolatility();
 }
 

engine/src/flutter/lib/web_ui/skwasm/fonts.cpp

@@ -61,7 +61,8 @@ SKWASM_EXPORT int typefaces_filterCoveredCodePoints(SkTypeface** typefaces,
   int remainingCodePointCount = codePointCount;
   for (int typefaceIndex = 0; typefaceIndex < typefaceCount; typefaceIndex++) {
     typefaces[typefaceIndex]->unicharsToGlyphs(
-        codePoints, remainingCodePointCount, glyphPointer);
+        {codePoints, remainingCodePointCount},
+        {glyphPointer, remainingCodePointCount});
     int outputIndex = 0;
     for (int inputIndex = 0; inputIndex < remainingCodePointCount;
          inputIndex++) {

engine/src/flutter/lib/web_ui/skwasm/path.cpp

@@ -154,7 +154,7 @@ SKWASM_EXPORT void path_addPolygon(SkPath* path,
                                    const SkPoint* points,
                                    int count,
                                    bool close) {
-  path->addPoly(points, count, close);
+  path->addPoly({points, count}, close);
 }
 
 SKWASM_EXPORT void path_addRRect(SkPath* path, const SkScalar* rrectValues) {