commit 0eea0b277d7d35e4c2612646d7dfe507341e337e
author John Stiles <johnstiles@google.com> Sat Nov 25 22:41:31 2023 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Sun Nov 26 17:37:54 2023 +0000
tree a443f00fecf3b125c2799d03a1039c503f9d8eb8
parent 7c6b9495b415e59d866df8d10f930b1d34654887

Use SkToInt to avoid warning in Flutter roll.

The Flutter roll was failing due to -Wsign-compare.

Bug: chromium:1505053
Change-Id: Id12876f6f97682466f19b56cfa562366380f27cb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/783036
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/ganesh/ops/DrawMeshOp.cpp

diff --git a/src/gpu/ganesh/ops/DrawMeshOp.cpp b/src/gpu/ganesh/ops/DrawMeshOp.cpp
index eed2757..d8c0a40 100644
--- a/src/gpu/ganesh/ops/DrawMeshOp.cpp
+++ b/src/gpu/ganesh/ops/DrawMeshOp.cpp
@@ -1184,7 +1184,7 @@
     if (SkToBool(fIndexCount) != SkToBool(that->fIndexCount)) {
         return CombineResult::kCannotCombine;
     }
-    if (SkToBool(fIndexCount) && fVertexCount > UINT16_MAX - that->fVertexCount) {
+    if (SkToBool(fIndexCount) && fVertexCount > SkToInt(UINT16_MAX) - that->fVertexCount) {
         return CombineResult::kCannotCombine;
     }