Revert^2 "Remove mipmaps from SkBitmap's implementation"

This reverts commit 6a69295.

Reland "Remove mipmaps from SkBitmap's implementation"

This reverts commit 6a69295.

Reason for revert: Was not the culprit (see http://b/480815083#comment56)

Original change's description:
> Revert "Remove mipmaps from SkBitmap's implementation"
>
> This reverts commit 7e79e4a.
>
> Reason for revert: speculative fix for b/480815083, reverting to
> create a canary for checking. Edit: very clear candidate for b/479634079
>
> Original change's description:
> > Remove mipmaps from SkBitmap's implementation
> >
> > This pushes them down into SkImage_Raster and makes a Ganesh-specific
> > class to hold a bitmap and the mips.
> >
> > Suggested Review order:
> > - SkImage_Raster to see mips put there
> > - SkDraw, SkBitmapDevice, SkGlyphRunPainter, src/core/SkOverdrawCanvas to see CPU backend changes to thread mips in to image shader
> > - GrBitmap to see new Ganesh-specific class and SkGr.h for the internal API change.
> > - The rest of src/gpu/ganesh to see it being used.
> > - gm/showmiplevels.cpp (which I broke and then puzzled about what
> >   it was supposed to look like and then *why* it was supposed to
> >   look that way and I decided to write it down).
> > - All other changes in any order
> >
> > Change-Id: I93a36df817e5a607305786118b6f443aec166374
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1132776
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Auto-Submit: Kaylee Lubick <kjlubick@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
>
> Change-Id: I663686051f267f323d3775b70ccdbb618825e9dd
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1171276
> Auto-Submit: Noelle Scobie <nscobie@google.com>
> Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>

Change-Id: I8bfe4bfda6466405d49a98e9c493264763d89efb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1182996
Owners-Override: Kaylee Lubick <kjlubick@google.com>
Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
Commit-Queue: Kaylee Lubick <kjlubick@google.com>

Author: kjlubick

gm/fp_sample_chaining.cpp

@@ -18,6 +18,7 @@
 #include "src/gpu/ganesh/effects/GrMatrixEffect.h"
 #include "src/gpu/ganesh/effects/GrTextureEffect.h"
 #include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/ganesh/image/GrMippedBitmap.h"
 #include "tools/ToolUtils.h"
 #include "tools/fonts/FontToolUtils.h"
 
@@ -189,14 +190,16 @@ DEF_SIMPLE_GPU_GM_CAN_FAIL(fp_sample_chaining, rContext, canvas, errorMsg, 232,
     auto nextRow = [&] { x = 10; y += (64 + 10); };
 
     auto draw = [&](std::initializer_list<EffectType> effects) {
-        // Enable TestPatternEffect to get a fully procedural inner effect. It's not quite as nice
-        // visually (no text labels in each box), but it avoids the extra GrMatrixEffect.
-        // Switching it on actually triggers *more* shader compilation failures.
+    // Enable TestPatternEffect to get a fully procedural inner effect. It's not quite as nice
+    // visually (no text labels in each box), but it avoids the extra GrMatrixEffect.
+    // Switching it on actually triggers *more* shader compilation failures.
 #if 0
         auto fp = std::unique_ptr<GrFragmentProcessor>(new TestPatternEffect());
 #else
-        auto view = std::get<0>(GrMakeCachedBitmapProxyView(
-                rContext, bmp, /*label=*/"FpSampleChaining", skgpu::Mipmapped::kNo));
+        auto view = std::get<0>(GrMakeCachedBitmapProxyView(rContext,
+                                                            GrMippedBitmap(bmp),
+                                                            /*label=*/"FpSampleChaining",
+                                                            skgpu::Mipmapped::kNo));
         auto fp = GrTextureEffect::Make(std::move(view), bmp.alphaType());
 #endif
         for (EffectType effectType : effects) {

gm/fpcoordinateoverride.cpp

@@ -28,6 +28,7 @@
 #include "src/gpu/ganesh/effects/GrSkSLFP.h"
 #include "src/gpu/ganesh/effects/GrTextureEffect.h"
 #include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/ganesh/image/GrMippedBitmap.h"
 #include "tools/DecodeUtils.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
@@ -84,8 +85,9 @@ DEF_SIMPLE_GPU_GM_BG(fpcoordinateoverride, rContext, canvas, 512, 512,
 
     SkBitmap bmp;
     ToolUtils::GetResourceAsBitmap("images/mandrill_512_q075.jpg", &bmp);
+    auto bitmap = GrMippedBitmap(bmp);
     auto view = std::get<0>(GrMakeCachedBitmapProxyView(
-            rContext, bmp, /*label=*/"FpCoordinateOverride", skgpu::Mipmapped::kNo));
+            rContext, bitmap, /*label=*/"FpCoordinateOverride", skgpu::Mipmapped::kNo));
     if (!view) {
         return;
     }

gm/showmiplevels.cpp

@@ -28,7 +28,26 @@
 
 #include <math.h>
 
-class ShowMipLevels3 : public skiagm::GM {
+/**
+ * This GM explicitly makes mip map levels solid colors so we can see which are being used.
+ *
+ * Rows 0 and 1 don't use mip maps, so the rocket ship gets smaller (and tiled) from
+ * left to right. The only difference is the filter mode - Row 0 (nearest) looks blockier
+ * than Row 1 (linear).
+ *
+ * Rows 2 and 3 use the nearest mip map mode, which means we expect
+ * Everything other than the first two columns (which are closest to mip level 0 - original image)
+ * will be solid colors (Red, Green, Blue) to show this is happening. The sublte difference in
+ * filtering can still be observed in Column 1.
+ *
+ * Rows 4 and 5 use a linear mipmap mode, which means the we'll see a blend of red and spaceships
+ * for columns 1 and 2, and non-pure colors for the remaining columns as the breakpoints don't
+ * land directly on the mip level changes.
+ *
+ * If the image is being rendered and all rows show the spaceships from left to right, the
+ * hand-crafted mips are being lost somewhere in rendering and that is *wrong*.
+ */
+class ShowMipLevels : public skiagm::GM {
     sk_sp<SkImage> fImg;
 
     SkString getName() const override { return SkString("showmiplevels_explicit"); }
@@ -42,6 +61,9 @@ class ShowMipLevels3 : public skiagm::GM {
         const SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
 
         SkMipmapBuilder builder(fImg->imageInfo());
+        // The number of levels is derived from the size of the image, so we intentionally
+        // pick an image that's big enough to support 3+ levels.
+        SkASSERT(builder.countLevels() >= (int)std::size(colors));
         for (int i = 0; i < builder.countLevels(); ++i) {
             auto surf = SkSurfaces::WrapPixels(builder.level(i));
             surf->getCanvas()->drawColor(colors[i % std::size(colors)]);
@@ -76,7 +98,5 @@ class ShowMipLevels3 : public skiagm::GM {
         }
         return r.height() + 10;
     }
-
-    using INHERITED = skiagm::GM;
 };
-DEF_GM( return new ShowMipLevels3; )
+DEF_GM(return new ShowMipLevels;)

gm/swizzle.cpp

@@ -18,6 +18,7 @@
 #include "src/gpu/ganesh/SkGr.h"
 #include "src/gpu/ganesh/SurfaceFillContext.h"
 #include "src/gpu/ganesh/effects/GrTextureEffect.h"
+#include "src/gpu/ganesh/image/GrMippedBitmap.h"
 #include "tools/DecodeUtils.h"
 #include "tools/Resources.h"
 
@@ -29,13 +30,16 @@ DEF_SIMPLE_GPU_GM(swizzle, rContext, canvas, 512, 512) {
 
     SkBitmap bmp;
     ToolUtils::GetResourceAsBitmap("images/mandrill_512_q075.jpg", &bmp);
+    auto bitmap = GrMippedBitmap::Make(bmp.pixmap());
+    SkASSERT_RELEASE(bitmap);
+    SkAlphaType alphaType = bitmap->alphaType();
     auto view = std::get<0>(GrMakeCachedBitmapProxyView(
-            rContext, bmp, /*label=*/"Gm_Swizzle", skgpu::Mipmapped::kNo));
+            rContext, bitmap.value(), /*label=*/"Gm_Swizzle", skgpu::Mipmapped::kNo));
     if (!view) {
         return;
     }
     std::unique_ptr<GrFragmentProcessor> imgFP =
-        GrTextureEffect::Make(std::move(view), bmp.alphaType(), SkMatrix());
+            GrTextureEffect::Make(std::move(view), alphaType, SkMatrix());
     auto fp = GrFragmentProcessor::SwizzleOutput(std::move(imgFP), skgpu::Swizzle("grb1"));
 
     sfc->fillWithFP(std::move(fp));

gm/texelsubset.cpp

@@ -26,6 +26,7 @@
 #include "src/gpu/ganesh/SkGr.h"
 #include "src/gpu/ganesh/SurfaceDrawContext.h"
 #include "src/gpu/ganesh/effects/GrTextureEffect.h"
+#include "src/gpu/ganesh/image/GrMippedBitmap.h"
 #include "tools/DecodeUtils.h"
 #include "tools/Resources.h"
 #include "tools/ganesh/TestOps.h"
@@ -101,8 +102,10 @@ class TexelSubset : public GpuGM {
         if (mipmapped == skgpu::Mipmapped::kYes && !rContext->priv().caps()->mipmapSupport()) {
             return DrawResult::kSkip;
         }
-        auto view = std::get<0>(GrMakeCachedBitmapProxyView(
-                rContext, fBitmap, /*label=*/"DrawResult_Draw_BitMap", mipmapped));
+        auto view = std::get<0>(GrMakeCachedBitmapProxyView(rContext,
+                                                            GrMippedBitmap(fBitmap),
+                                                            /*label=*/"DrawResult_Draw_BitMap",
+                                                            mipmapped));
         if (!view) {
             *errorMsg = "Failed to create proxy.";
             return DrawResult::kFail;
@@ -135,8 +138,11 @@ class TexelSubset : public GpuGM {
         SkBitmap subsetBmp;
         fBitmap.extractSubset(&subsetBmp, texelSubset);
         subsetBmp.setImmutable();
-        auto subsetView = std::get<0>(GrMakeCachedBitmapProxyView(
-                rContext, subsetBmp, /*label=*/"DrawResult_Draw_SubsetBitMap", mipmapped));
+        auto subsetView =
+                std::get<0>(GrMakeCachedBitmapProxyView(rContext,
+                                                        GrMippedBitmap(subsetBmp),
+                                                        /*label=*/"DrawResult_Draw_SubsetBitMap",
+                                                        mipmapped));
 
         SkRect localRect = SkRect::Make(fBitmap.bounds()).makeOutset(kDrawPad, kDrawPad);
 

gn/gpu.gni

@@ -429,6 +429,8 @@ skia_ganesh_private = [
   "$_src/gpu/ganesh/gradients/GrGradientShader.h",
   "$_src/gpu/ganesh/image/GrImageUtils.cpp",
   "$_src/gpu/ganesh/image/GrImageUtils.h",
+  "$_src/gpu/ganesh/image/GrMippedBitmap.cpp",
+  "$_src/gpu/ganesh/image/GrMippedBitmap.h",
   "$_src/gpu/ganesh/image/GrTextureGenerator.cpp",
   "$_src/gpu/ganesh/image/SkImage_Ganesh.cpp",
   "$_src/gpu/ganesh/image/SkImage_Ganesh.h",

include/core/SkBitmap.h

@@ -27,7 +27,6 @@
 class SkColorSpace;
 class SkImage;
 class SkMatrix;
-class SkMipmap;
 class SkPaint;
 class SkPixelRef;
 class SkShader;
@@ -1241,13 +1240,8 @@ class SK_API SkBitmap {
     };
 
 private:
-    sk_sp<SkPixelRef>   fPixelRef;
-    SkPixmap            fPixmap;
-    sk_sp<SkMipmap>     fMips;
-
-    friend class SkImage_Raster;
-    friend class SkReadBuffer;        // unflatten
-    friend class GrProxyProvider;     // fMips
+    sk_sp<SkPixelRef> fPixelRef;
+    SkPixmap fPixmap;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

src/android/SkAnimatedImage.cpp

@@ -384,6 +384,7 @@ sk_sp<SkImage> SkAnimatedImage::getCurrentFrame() {
 
     SkCanvas canvas(dst);
     this->draw(&canvas);
+    dst.setImmutable();
     return SkImage_Raster::MakeFromBitmap(dst, SkCopyPixelsMode::kNever);
 }
 

src/codec/SkWuffsCodec.cpp

@@ -33,6 +33,7 @@
 #include "src/codec/SkSampler.h"
 #include "src/codec/SkScalingCodec.h"
 #include "src/core/SkDraw.h"
+#include "src/core/SkMipmap.h"
 #include "src/core/SkRasterClip.h"
 #include "src/core/SkStreamPriv.h"
 
@@ -743,7 +744,7 @@ SkCodec::Result SkWuffsCodec::onIncrementalDecodeTwoPass() {
         draw.fRC = &rc;
 
         SkMatrix translate = SkMatrix::Translate(dirty_rect.min_incl_x, dirty_rect.min_incl_y);
-        draw.drawBitmap(src, translate, nullptr, SkSamplingOptions(), paint);
+        draw.drawBitmap(src, translate, nullptr, SkSamplingOptions(), paint, nullptr);
     }
 
     if (result == SkCodec::kSuccess) {

src/core/SkBitmap.cpp

@@ -42,20 +42,13 @@ static bool reset_return_false(SkBitmap* bm) {
 
 SkBitmap::SkBitmap() {}
 
-SkBitmap::SkBitmap(const SkBitmap& src)
-    : fPixelRef      (src.fPixelRef)
-    , fPixmap        (src.fPixmap)
-    , fMips          (src.fMips)
-{
+SkBitmap::SkBitmap(const SkBitmap& src) : fPixelRef(src.fPixelRef), fPixmap(src.fPixmap) {
     SkDEBUGCODE(src.validate();)
     SkDEBUGCODE(this->validate();)
 }
 
 SkBitmap::SkBitmap(SkBitmap&& other)
-    : fPixelRef      (std::move(other.fPixelRef))
-    , fPixmap        (std::move(other.fPixmap))
-    , fMips          (std::move(other.fMips))
-{
+        : fPixelRef(std::move(other.fPixelRef)), fPixmap(std::move(other.fPixmap)) {
     SkASSERT(!other.fPixelRef);
     other.fPixmap.reset();
 }
@@ -65,8 +58,7 @@ SkBitmap::~SkBitmap() {}
 SkBitmap& SkBitmap::operator=(const SkBitmap& src) {
     if (this != &src) {
         fPixelRef       = src.fPixelRef;
-        fPixmap         = src.fPixmap;
-        fMips           = src.fMips;
+        fPixmap = src.fPixmap;
     }
     SkDEBUGCODE(this->validate();)
     return *this;
@@ -75,8 +67,7 @@ SkBitmap& SkBitmap::operator=(const SkBitmap& src) {
 SkBitmap& SkBitmap::operator=(SkBitmap&& other) {
     if (this != &other) {
         fPixelRef       = std::move(other.fPixelRef);
-        fPixmap         = std::move(other.fPixmap);
-        fMips           = std::move(other.fMips);
+        fPixmap = std::move(other.fPixmap);
         SkASSERT(!other.fPixelRef);
         other.fPixmap.reset();
     }
@@ -92,7 +83,6 @@ void SkBitmap::swap(SkBitmap& other) {
 void SkBitmap::reset() {
     fPixelRef = nullptr;  // Free pixels.
     fPixmap.reset();
-    fMips.reset();
 }
 
 void SkBitmap::getBounds(SkRect* bounds) const {