diff options
author | Herb Derby <herb@google.com> | 2022-10-13 15:34:35 -0400 |
---|---|---|
committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | 2022-10-13 21:44:34 +0000 |
commit | 8b1a2976274f416ff1042485fcdf17dcdd7bcd51 (patch) | |
tree | dca45e3234208b090b25008dc42502b55060ddce /tests/SerialProcsTest.cpp | |
parent | 4e768e2d9a4954c92a6d4fb7402d7c85dfb45a23 (diff) | |
download | skia-8b1a2976274f416ff1042485fcdf17dcdd7bcd51.tar.gz |
Remove find() from SkTDArray
Inline a simple find implementation where this call was used.
Change-Id: I3ba4241d110f21187a13d9559906e403bf46cf9c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/591180
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'tests/SerialProcsTest.cpp')
-rw-r--r-- | tests/SerialProcsTest.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/SerialProcsTest.cpp b/tests/SerialProcsTest.cpp index f4828d0a15..fee34b70b7 100644 --- a/tests/SerialProcsTest.cpp +++ b/tests/SerialProcsTest.cpp @@ -14,6 +14,8 @@ #include "tools/Resources.h" #include "tools/ToolUtils.h" +#include <algorithm> + static sk_sp<SkImage> picture_to_image(sk_sp<SkPicture> pic) { SkIRect r = pic->cullRect().round(); auto surf = SkSurface::MakeRasterN32Premul(r.width(), r.height()); @@ -124,9 +126,11 @@ static sk_sp<SkPicture> array_deserial_proc(const void* data, size_t size, void* SkPicture* pic; memcpy(&pic, data, size); - int index = c->fArray.find(pic); - SkASSERT(index >= 0); - c->fArray.removeShuffle(index); + auto found = std::find(c->fArray.begin(), c->fArray.end(), pic); + SkASSERT(found != c->fArray.end()); + if (found != c->fArray.end()) { + c->fArray.removeShuffle(std::distance(c->fArray.begin(), found)); + } return sk_ref_sp(pic); } |