Remove unused MakeFromTextureCopy API
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165803002
Review-Url: https://codereview.chromium.org/2165803002
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index c0f37c3..6021590 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -120,15 +120,6 @@
SkAlphaType = kPremul_SkAlphaType);
/**
- * Create a new image by copying the pixels from the specified descriptor. No reference is
- * kept to the original platform texture.
- *
- * Will return NULL if the specified descriptor is unsupported.
- */
- static sk_sp<SkImage> MakeFromTextureCopy(GrContext*, const GrBackendTextureDesc&,
- SkAlphaType = kPremul_SkAlphaType);
-
- /**
* Create a new image by copying the pixels from the specified y, u, v textures. The data
* from the textures is immediately ingested into the image and the textures can be modified or
* deleted after the function returns. The image will have the dimensions of the y texture.
@@ -443,8 +434,6 @@
TextureReleaseProc, ReleaseContext);
static SkImage* NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
SkAlphaType = kPremul_SkAlphaType);
- static SkImage* NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&,
- SkAlphaType = kPremul_SkAlphaType);
static SkImage* NewFromYUVTexturesCopy(GrContext*, SkYUVColorSpace,
const GrBackendObject yuvTextureHandles[3],
const SkISize yuvSizes[3],
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index b7f4225..e6d66a1 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -416,10 +416,6 @@
return nullptr;
}
-sk_sp<SkImage> SkImage::MakeFromTextureCopy(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
- return nullptr;
-}
-
sk_sp<SkImage> SkImage::MakeFromYUVTexturesCopy(GrContext* ctx, SkYUVColorSpace space,
const GrBackendObject yuvTextureHandles[3],
const SkISize yuvSizes[3],
@@ -476,11 +472,6 @@
return MakeFromAdoptedTexture(ctx, desc, at).release();
}
-SkImage* SkImage::NewFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& desc,
- SkAlphaType at) {
- return MakeFromTextureCopy(ctx, desc, at).release();
-}
-
SkImage* SkImage::NewFromYUVTexturesCopy(GrContext* ctx, SkYUVColorSpace space,
const GrBackendObject yuvTextureHandles[3],
const SkISize yuvSizes[3],
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 21ef52e..7c08b13 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -183,27 +183,6 @@
return new_wrapped_texture_common(ctx, desc, at, kAdopt_GrWrapOwnership, nullptr, nullptr);
}
-sk_sp<SkImage> SkImage::MakeFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& desc,
- SkAlphaType at) {
- if (desc.fWidth <= 0 || desc.fHeight <= 0) {
- return nullptr;
- }
-
- SkAutoTUnref<GrTexture> src(ctx->textureProvider()->wrapBackendTexture(
- desc, kBorrow_GrWrapOwnership));
- if (!src) {
- return nullptr;
- }
-
- SkAutoTUnref<GrTexture> dst(GrDeepCopyTexture(src, SkBudgeted::kYes));
- if (!dst) {
- return nullptr;
- }
-
- return sk_make_sp<SkImage_Gpu>(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, at, dst,
- SkBudgeted::kYes);
-}
-
static sk_sp<SkImage> make_from_yuv_textures_copy(GrContext* ctx, SkYUVColorSpace colorSpace,
bool nv12,
const GrBackendObject yuvTextureHandles[],
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 0f760a6..efded7c 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -782,11 +782,8 @@
sk_sp<SkImage> refImg(
SkImage::MakeFromTexture(ctxInfo.grContext(), backendDesc, kPremul_SkAlphaType,
TextureReleaseChecker::Release, &releaseChecker));
- sk_sp<SkImage> cpyImg(SkImage::MakeFromTextureCopy(ctxInfo.grContext(), backendDesc,
- kPremul_SkAlphaType));
check_image_color(reporter, refImg.get(), expected0);
- check_image_color(reporter, cpyImg.get(), expected0);
// Now lets jam new colors into our "external" texture, and see if the images notice
const SkPMColor expected1 = SkPreMultiplyColor(SK_ColorBLUE);
@@ -799,7 +796,6 @@
// write pixels call violated the contract with refImg and refImg is now undefined.
check_image_color(reporter, refImg, expected1);
#endif
- check_image_color(reporter, cpyImg.get(), expected0);
// Now exercise the release proc
REPORTER_ASSERT(reporter, 0 == releaseChecker.fReleaseCount);