Always validate GrBackendTextures passed to YUV image factories

Change-Id: I73a301fcdf13fceb82c94b0c68ac9386aa38e16d
Reviewed-on: https://skia-review.googlesource.com/115126
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index e2b461f801..4733cae06e 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -377,12 +377,9 @@ sk_sp<SkImage> SkImage_Gpu::MakeFromYUVTexturesCopyImpl(
     };
     auto ct = nv12 ? kRGBA_8888_SkColorType : kAlpha_8_SkColorType;
     for (int i = 0; i < (nv12 ? 2 : 3); ++i) {
-        if (yuvBackendTextures[i].fConfig == kUnknown_GrPixelConfig) {
-            if (!validate_backend_texture(ctx, yuvBackendTextures[i],
-                                          &yuvBackendTextures[i].fConfig, ct, kPremul_SkAlphaType,
-                                          nullptr)) {
-                return nullptr;
-            }
+        if (!validate_backend_texture(ctx, yuvBackendTextures[i], &yuvBackendTextures[i].fConfig,
+                                      ct, kPremul_SkAlphaType, nullptr)) {
+            return nullptr;
         }
     }
     sk_sp<GrTextureProxy> yProxy = proxyProvider->wrapBackendTexture(yuvBackendTextures[0], origin);