commit 14da7123845560fda2d65203bf01ff64868ed80b
author Herb Derby <herb@google.com> Mon Aug 01 11:35:10 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Aug 01 18:01:44 2022 +0000
tree 99c257a40e7dc417190d36ddfeac23287700c892
parent 269bcc7b148d5c3d582b8747a90cecc164124949

Use bulk SkPoint serialization API for DirectMaskSubRun

Use the bulk SkPoint serialization routines in the DirectMaskSubRun.
I tried doing all the SubRuns at once in a previous CL, but that
failed. I'm going slowly, and converting one SubRun at a time.

Change-Id: I36f343590a96d918f768575b198ddb93a1c059d5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/564057
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/text/gpu/SubRunContainer.cpp

diff --git a/src/text/gpu/SubRunContainer.cpp b/src/text/gpu/SubRunContainer.cpp
index 88ab18c..e6006b2 100644
--- a/src/text/gpu/SubRunContainer.cpp
+++ b/src/text/gpu/SubRunContainer.cpp
@@ -1318,18 +1318,22 @@
     SkGlyphRect runBounds;
     pun_read(buffer, &runBounds);
 
-    int glyphCount = buffer.readInt();
-    if (!buffer.validate(check_glyph_count(buffer, glyphCount))) { return nullptr; }
-    if (!buffer.validateCanReadN<SkPoint>(glyphCount)) { return nullptr; }
+    uint32_t glyphCount = buffer.getArrayCount();
+
+    // Zero indicates a problem with serialization.
+    if (!buffer.validate(glyphCount != 0)) { return nullptr; }
+
+    // The arena can only handle kGlyphCountMax number of points.
+    static constexpr uint32_t kGlyphCountMax = INT_MAX / sizeof(SkPoint);
+    if (!buffer.validate(glyphCount < kGlyphCountMax)) { return nullptr; }
+
     SkPoint* positionsData = alloc->makePODArray<SkPoint>(glyphCount);
-    for (int i = 0; i < glyphCount; ++i) {
-        positionsData[i] = buffer.readPoint();
-    }
+    if (!buffer.readPointArray(positionsData, glyphCount)) { return nullptr; }
     SkSpan<SkPoint> positions(positionsData, glyphCount);
 
     auto glyphVector = GlyphVector::MakeFromBuffer(buffer, client, alloc);
     if (!buffer.validate(glyphVector.has_value())) { return nullptr; }
-    if (!buffer.validate(SkCount(glyphVector->glyphs()) == glyphCount)) { return nullptr; }
+    if (!buffer.validate(SkCount(glyphVector->glyphs()) == SkToInt(glyphCount))) { return nullptr; }
     SkASSERT(buffer.isValid());
     return alloc->makeUnique<DirectMaskSubRun>(
             maskType, initialPositionMatrix, runBounds, positions,
@@ -1339,11 +1343,7 @@
 void DirectMaskSubRun::doFlatten(SkWriteBuffer& buffer) const {
     buffer.writeInt(static_cast<int>(fMaskFormat));
     pun_write(buffer, fGlyphDeviceBounds);
-    int glyphCount = SkTo<int>(fLeftTopDevicePos.size());
-    buffer.writeInt(glyphCount);
-    for (auto pos : fLeftTopDevicePos) {
-        buffer.writePoint(pos);
-    }
+    buffer.writePointArray(fLeftTopDevicePos.data(), SkCount(fLeftTopDevicePos));
     fGlyphs.flatten(buffer);
 }