SkBitmap now *has* a SkPixmap.

Before:

    class SkBitmap {
        sk_sp<SkPixelRef> fPixelRef;
        void*             fPixels;
        SkImageInfo       fInfo;
        uint32_t          fRowBytes;
        uint8_t           fFlags;
    };

After:

    class SkBitmap {
        sk_sp<SkPixelRef> fPixelRef;
        SkPixmap          fPixmap;
        uint8_t           fFlags;
    };

Change-Id: I62d59ca3e702b7adea022cd3cfbf0cc3186af957
Reviewed-on: https://skia-review.googlesource.com/85560
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp
index 1374186ce2..44727a4563 100644
--- a/gm/all_bitmap_configs.cpp
+++ b/gm/all_bitmap_configs.cpp
@@ -211,7 +211,7 @@ static void make_color_test_bitmap_variant(
     SkASSERT(alphaType == kPremul_SkAlphaType || alphaType == kUnpremul_SkAlphaType);
     bm->allocPixels(
         SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, colorSpace));
-    SkPixmap pm = bm->pixmap();
+    const SkPixmap& pm = bm->pixmap();
     for (int y = 0; y < pm.height(); y++) {
         for (int x = 0; x < pm.width(); x++) {
             *pm.writable_addr32(x, y) = make_pixel(x, y, alphaType);