commit 4efaf5e9feada3eddf286fb362f60d3b11a24e34
author Brian Salomon <bsalomon@google.com> Mon Oct 12 21:30:00 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 12 22:16:13 2020 +0000
tree 9043750ffaa85a08393d42a3422cd74164a044dd
parent 5d08a27530720e114466e5f8d121925a89076da4

Reland "Revert "Use ManagedBackendTexture in place of TestUtils backend texture helpers.""

This reverts commit 21f8b5109951b16ff327f39072d7b5b141ac5c09.

Reason for revert: D3D traced resource assert from unit test

Original change's description:
> Revert "Revert "Use ManagedBackendTexture in place of TestUtils backend texture helpers.""
>
> This reverts commit f625e4ce4504facbf0cfa210f8d9770b8431cdd9.
>
> Change-Id: Id73c53ec7ab8d4a5951712dc150d86e6349addbf
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325658
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

# Not skipping CQ checks because this is a reland.

Change-Id: I407f1d522d5c4f28d070cc2ce87af7faffca11fd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325860
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tools/gpu/BackendTextureImageFactory.h

diff --git a/tools/gpu/BackendTextureImageFactory.h b/tools/gpu/BackendTextureImageFactory.h
index 289f268..3de31a5 100644
--- a/tools/gpu/BackendTextureImageFactory.h
+++ b/tools/gpu/BackendTextureImageFactory.h
@@ -5,15 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkColor.h"
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrTypes.h"
 
 class GrDirectContext;
-class SkColorSpace;
 class SkImage;
 class SkPixmap;
-struct SkISize;
 
 namespace sk_gpu_test {
 /**
@@ -23,17 +20,6 @@
  * For testing purposes the texture can be made renderable to exercise different code paths for
  * renderable textures/formats.
  */
-sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext*,
-                                       const SkPixmap&,
-                                       GrRenderable,
-                                       GrSurfaceOrigin);
-
-/** Creates an image of with a solid color. */
-sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext*,
-                                       const SkImageInfo& info,
-                                       SkColor4f,
-                                       GrMipmapped = GrMipmapped::kNo,
-                                       GrRenderable = GrRenderable::kNo,
-                                       GrSurfaceOrigin = GrSurfaceOrigin::kTopLeft_GrSurfaceOrigin);
-
+sk_sp<SkImage> MakeBackendTextureImage(GrDirectContext*, const SkPixmap&,
+                                       GrRenderable, GrSurfaceOrigin);
 }  // namespace sk_gpu_test