Remove SkTransferFunctionBehavior

Bug: skia:
Change-Id: Iccbe609b2a8d4c9098ef36aa6530dbc3771e0c11
Reviewed-on: https://skia-review.googlesource.com/141055
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

4 files changed, 12 insertions, 14 deletions

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 6d936f9436..3c88b50d03 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -482,19 +482,19 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkBitmap::readPixels(const SkImageInfo& requestedDstInfo, void* dstPixels, size_t dstRB,
-                          int x, int y, SkTransferFunctionBehavior behavior) const {
+                          int x, int y) const {
     SkPixmap src;
     if (!this->peekPixels(&src)) {
         return false;
     }
-    return src.readPixels(requestedDstInfo, dstPixels, dstRB, x, y, behavior);
+    return src.readPixels(requestedDstInfo, dstPixels, dstRB, x, y);
 }
 
 bool SkBitmap::readPixels(const SkPixmap& dst, int srcX, int srcY) const {
     return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), srcX, srcY);
 }
 
-bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY, SkTransferFunctionBehavior) {
+bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY) {
     if (!SkImageInfoValidConversion(this->info(), src.info())) {
         return false;
     }
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index d91b3cc9c1..bfbb7a4e54 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -80,8 +80,8 @@ bool SkPixmap::extractSubset(SkPixmap* result, const SkIRect& subset) const {
     return true;
 }
 
-bool SkPixmap::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB, int x, int y,
-                          SkTransferFunctionBehavior) const {
+bool SkPixmap::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
+                          int x, int y) const {
     if (!SkImageInfoValidConversion(dstInfo, fInfo)) {
         return false;
     }
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index da2780b03d..e3e107ea2e 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -295,8 +295,7 @@ bool SkImage::isAlphaOnly() const {
     return as_IB(this)->onImageInfo().colorType() == kAlpha_8_SkColorType;
 }
 
-sk_sp<SkImage> SkImage::makeColorSpace(sk_sp<SkColorSpace> target,
-                                       SkTransferFunctionBehavior) const {
+sk_sp<SkImage> SkImage::makeColorSpace(sk_sp<SkColorSpace> target) const {
     SkColorSpaceTransferFn fn;
     if (!target || !target->isNumericalTransferFn(&fn)) {
         return nullptr;
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index 5549de240d..14ebae7a26 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -39,19 +39,19 @@ public:
                     SkShader::TileMode tmx,
                     SkShader::TileMode tmy,
                     const SkSize& scale,
-                    SkTransferFunctionBehavior blendBehavior)
+                    bool hasDstColorSpace)
         : fColorSpace(std::move(colorSpace))
         , fTile(tile)
         , fTmx(tmx)
         , fTmy(tmy)
         , fScale(scale)
-        , fBlendBehavior(blendBehavior) {
+        , fHasDstColorSpace(hasDstColorSpace ? 1 : 0) {
 
         static const size_t keySize = sizeof(fColorSpace) +
                                       sizeof(fTile) +
                                       sizeof(fTmx) + sizeof(fTmy) +
                                       sizeof(fScale) +
-                                      sizeof(fBlendBehavior);
+                                      sizeof(fHasDstColorSpace);
         // This better be packed.
         SkASSERT(sizeof(uint32_t) * (&fEndOfStruct - (uint32_t*)&fColorSpace) == keySize);
         this->init(&gBitmapSkaderKeyNamespaceLabel, MakeSharedID(shaderID), keySize);
@@ -74,7 +74,7 @@ private:
     SkRect                     fTile;
     SkShader::TileMode         fTmx, fTmy;
     SkSize                     fScale;
-    SkTransferFunctionBehavior fBlendBehavior;
+    uint32_t                   fHasDstColorSpace;
 
     SkDEBUGCODE(uint32_t fEndOfStruct;)
 };
@@ -228,8 +228,7 @@ sk_sp<SkShader> SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix,
     // should perform color correct rendering and xform at draw time.
     SkASSERT(!fColorSpace || !dstColorSpace);
     sk_sp<SkColorSpace> keyCS = dstColorSpace ? sk_ref_sp(dstColorSpace) : fColorSpace;
-    SkTransferFunctionBehavior blendBehavior = dstColorSpace ? SkTransferFunctionBehavior::kRespect
-                                                             : SkTransferFunctionBehavior::kIgnore;
+    bool hasDstColorSpace = SkToBool(dstColorSpace);
 
     sk_sp<SkShader> tileShader;
     BitmapShaderKey key(std::move(keyCS),
@@ -238,7 +237,7 @@ sk_sp<SkShader> SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix,
                         fTmx,
                         fTmy,
                         tileScale,
-                        blendBehavior);
+                        hasDstColorSpace);
 
     if (!SkResourceCache::Find(key, BitmapShaderRec::Visitor, &tileShader)) {
         SkMatrix tileMatrix;