commit f9b00424233747abf77c6d593dec69632430a0a8
author Brian Salomon <bsalomon@google.com> Thu Oct 08 16:00:14 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 08 20:35:32 2020 +0000
tree d080e0d3a1fcbcd23dbfa8a9170ce88f1c003989
parent a96e080962e7b4d567672edea9270652b6746617

Expose ManagedBackendTexture from BackendTextureImageFactory.

Add helper to create self-managed BackendTexture-backed SkSurface for
tests using MBET.

GrGpu::createTestingOnlyBackendRenderTarget supports protected.

Make SkSurfaceCharacterization tests use self-managed SkSurface
factories and a use case of MakeFromBackendTextureAsRenderTarget is
removed.

Use self-managed BackendTexture-backed SkSurface factory in DM sinks and
in fm.

Bug: skia:9832

Change-Id: I0c1dc49697f8b3c942864e18b9112a3552f431ba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323559
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tools/gpu/BackendTextureImageFactory.cpp

diff --git a/tools/gpu/BackendTextureImageFactory.cpp b/tools/gpu/BackendTextureImageFactory.cpp
index 618ea6c..b0faf45 100644
--- a/tools/gpu/BackendTextureImageFactory.cpp
+++ b/tools/gpu/BackendTextureImageFactory.cpp
@@ -12,41 +12,7 @@
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrDirectContext.h"
 #include "src/core/SkAutoPixmapStorage.h"
-
-namespace {
-class ManagedBackendTexture : public SkNVRefCnt<ManagedBackendTexture> {
-public:
-    ~ManagedBackendTexture() {
-        if (fDContext && fTexture.isValid()) {
-            fDContext->submit(true);
-            fDContext->deleteBackendTexture(fTexture);
-        }
-    }
-
-    static void Release(void* context) { static_cast<ManagedBackendTexture*>(context)->unref(); }
-
-    template <typename... Args>
-    static sk_sp<ManagedBackendTexture> Make(GrDirectContext* dContext, Args&&... args) {
-        sk_sp<ManagedBackendTexture> mbet(new ManagedBackendTexture);
-        mbet->fDContext = dContext;
-        mbet->fTexture = dContext->createBackendTexture(std::forward<Args>(args)..., Release,
-                                                        mbet->refAndPassAsContext());
-        return mbet;
-    }
-
-    const GrBackendTexture& texture() { return fTexture; }
-
-    void* refAndPassAsContext() {
-        this->ref();
-        return static_cast<void*>(this);
-    }
-
-private:
-    ManagedBackendTexture() = default;
-    GrDirectContext* fDContext = nullptr;
-    GrBackendTexture fTexture;
-};
-}  // namespace
+#include "tools/gpu/ManagedBackendTexture.h"
 
 namespace sk_gpu_test {
 sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext* dContext,
@@ -64,14 +30,14 @@
         }
         src = &temp;
     }
-    auto mbet = ManagedBackendTexture::Make(dContext, src, 1, renderable, GrProtected::kNo);
+    auto mbet = ManagedBackendTexture::MakeWithData(dContext, src, 1, renderable, GrProtected::kNo);
     return SkImage::MakeFromTexture(dContext,
                                     mbet->texture(),
                                     origin,
                                     src->colorType(),
                                     src->alphaType(),
                                     src->refColorSpace(),
-                                    ManagedBackendTexture::Release,
-                                    mbet->refAndPassAsContext());
+                                    ManagedBackendTexture::ReleaseProc,
+                                    mbet->releaseContext());
 }
 }  // namespace sk_gpu_test