commit b87975c1338111cc447d884dd79432790d2eb7fc
author Robert Phillips <robertphillips@google.com> Tue Dec 08 11:51:02 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 08 17:39:12 2020 +0000
tree 4b1b7baf70d2399577b80e40d217815659d7ef7f
parent b6853e2c0912a409a10509f639285ebd62b18da0

Use the ManagedBackendTexture helper in fiddle_main

Change-Id: I84dd14cc3328bf2f9beb0c0ac17a4f98fb62baba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273017
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tools/gpu/ManagedBackendTexture.cpp

diff --git a/tools/gpu/ManagedBackendTexture.cpp b/tools/gpu/ManagedBackendTexture.cpp
index c03ff46..691ca2e 100644
--- a/tools/gpu/ManagedBackendTexture.cpp
+++ b/tools/gpu/ManagedBackendTexture.cpp
@@ -68,15 +68,28 @@
 }
 
 sk_sp<ManagedBackendTexture> ManagedBackendTexture::MakeFromBitmap(GrDirectContext* dContext,
-                                                                   const SkBitmap& bitmap,
+                                                                   const SkBitmap& src,
                                                                    GrMipmapped mipmapped,
                                                                    GrRenderable renderable,
                                                                    GrProtected isProtected) {
-    std::vector<SkPixmap> levels({bitmap.pixmap()});
+    SkPixmap srcPixmap;
+    if (!src.peekPixels(&srcPixmap)) {
+        return nullptr;
+    }
+
+    return MakeFromPixmap(dContext, srcPixmap, mipmapped, renderable, isProtected);
+}
+
+sk_sp<ManagedBackendTexture> ManagedBackendTexture::MakeFromPixmap(GrDirectContext* dContext,
+                                                                   const SkPixmap& src,
+                                                                   GrMipmapped mipmapped,
+                                                                   GrRenderable renderable,
+                                                                   GrProtected isProtected) {
+    std::vector<SkPixmap> levels({src});
     std::unique_ptr<SkMipmap> mm;
 
     if (mipmapped == GrMipmapped::kYes) {
-        mm.reset(SkMipmap::Build(bitmap, nullptr));
+        mm.reset(SkMipmap::Build(src, nullptr));
         if (!mm) {
             return nullptr;
         }