commit 4a98bd50c027acbc7ea4ae68abcb038b83af1a93
author Jim Van Verth <jvanverth@google.com> Fri Mar 28 09:37:15 2025 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Mar 28 08:02:47 2025 -0700
tree fa1af10d65fdebcf1d4fb728cf9ce5895474d664
parent 170718b3ea94cb2b066d0b32b5a7baa59de5c4a2

[graphite] Fix SkBitmap creation for ClipAtlas ProxyCache use.

Using detachPixels() also clears the pixmap's info so we need to make
a copy beforehand.

Bug: b/404880920
Change-Id: I010242ef4529ec7c8108259e78172632b1ab9e25
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/971416
Reviewed-by: Thomas Smith <thomsmit@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/graphite/ClipAtlasManager.cpp

diff --git a/src/gpu/graphite/ClipAtlasManager.cpp b/src/gpu/graphite/ClipAtlasManager.cpp
index 1b0b694..9c20144 100644
--- a/src/gpu/graphite/ClipAtlasManager.cpp
+++ b/src/gpu/graphite/ClipAtlasManager.cpp
@@ -145,9 +145,12 @@
                 draw_clip_mask_to_pixmap(cdc->fElementList, cdc->fBounds, cdc->fRenderSize,
                                          cdc->fDrawBounds, &dst);
                 SkBitmap bm;
+                // SkPixmap::detachPixels() clears these so we need to make a copy.
+                SkImageInfo ii = dst.info();
+                size_t rowBytes = dst.rowBytes();
                 // The bitmap needs to take ownership of the pixels, so we detach them from the
                 // SkAutoPixmapStorage and pass them to SkBitmap::installPixels().
-                SkAssertResult(bm.installPixels(dst.info(), dst.detachPixels(), dst.rowBytes(),
+                SkAssertResult(bm.installPixels(ii, dst.detachPixels(), rowBytes,
                                                 [](void* addr, void* context) { sk_free(addr); },
                                                 nullptr));
                 bm.setImmutable();