commit 729fc0cb65f72bfd70ff9f09a404d2d5da8716f2
author Brian Salomon <bsalomon@google.com> Mon Sep 30 16:33:11 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 30 16:33:19 2019 +0000
tree acdb65b0954656f76893767c6260755cecda6fae
parent 35048fab8adb001547d5e9aa8b475b58e5ece96f

Revert "Construct GPU SkImages with SkColorType, don't infer from GrPixelConfig"

This reverts commit 384f6e35b1a9716f58e584498749c40f23fe6690.

Reason for revert: bot breakage

Original change's description:
> Construct GPU SkImages with SkColorType, don't infer from GrPixelConfig
> 
> Bug: skia:6718
> 
> Change-Id: I8828939427481ea7780a66fc0fed8e9909baba9b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245156
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

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

Change-Id: Ib52b457bfc4b323ce06ee5359d9e9ab580aff6ea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:6718
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245166
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/image/SkImage_GpuBase.cpp

diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index 2d70262..4c3761a 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -27,6 +27,8 @@
         : INHERITED(SkImageInfo::Make(width, height, ct, at, std::move(cs)), uniqueID)
         , fContext(std::move(context)) {}
 
+SkImage_GpuBase::~SkImage_GpuBase() {}
+
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 #if GR_TEST_UTILS
@@ -124,8 +126,8 @@
     }
 
     // MDB: this call is okay bc we know 'sContext' was kExact
-    return sk_make_sp<SkImage_Gpu>(fContext, kNeedNewImageUniqueID, this->colorType(),
-                                   this->alphaType(), this->refColorSpace(), std::move(copyProxy));
+    return sk_make_sp<SkImage_Gpu>(fContext, kNeedNewImageUniqueID, this->alphaType(),
+                                   std::move(copyProxy), this->refColorSpace());
 }
 
 bool SkImage_GpuBase::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,