4 files changed, 6 insertions, 14 deletions
diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h
index e6903bc5e8..a7707fec52 100644
--- a/src/images/SkImageEncoderPriv.h
+++ b/src/images/SkImageEncoderPriv.h
@@ -11,17 +11,9 @@
 #include "SkImageEncoder.h"
 #include "SkImageInfoPriv.h"
 
-static inline bool SkPixmapIsValid(const SkPixmap& src,
-                                   SkTransferFunctionBehavior unpremulBehavior)
-{
-    if (SkTransferFunctionBehavior::kRespect == unpremulBehavior) {
-        if (!SkImageInfoIsValidRenderingCS(src.info())) {
-            return false;
-        }
-    } else {
-        if (!SkImageInfoIsValidAllowNumericalCS(src.info())) {
-            return false;
-        }
+static inline bool SkPixmapIsValid(const SkPixmap& src) {
+    if (!SkImageInfoIsValid(src.info())) {
+        return false;
     }
 
     if (!src.addr() || src.rowBytes() < src.info().minRowBytes()) {
diff --git a/src/images/SkJpegEncoder.cpp b/src/images/SkJpegEncoder.cpp
index 606b553537..9c139f707b 100644
--- a/src/images/SkJpegEncoder.cpp
+++ b/src/images/SkJpegEncoder.cpp
@@ -181,7 +181,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& srcInfo, const SkJpegEncoder
 
 std::unique_ptr<SkEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixmap& src,
                                                const Options& options) {
-    if (!SkPixmapIsValid(src, options.fBlendBehavior)) {
+    if (!SkPixmapIsValid(src)) {
         return nullptr;
     }
 
diff --git a/src/images/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
index 19fc27e4a6..fffda73fd0 100644
--- a/src/images/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -364,7 +364,7 @@ void SkPngEncoderMgr::chooseProc(const SkImageInfo& srcInfo,
 
 std::unique_ptr<SkEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& src,
                                               const Options& options) {
-    if (!SkPixmapIsValid(src, options.fUnpremulBehavior)) {
+    if (!SkPixmapIsValid(src)) {
         return nullptr;
     }
 
diff --git a/src/images/SkWebpEncoder.cpp b/src/images/SkWebpEncoder.cpp
index ee13563ea7..2cb55d2f04 100644
--- a/src/images/SkWebpEncoder.cpp
+++ b/src/images/SkWebpEncoder.cpp
@@ -109,7 +109,7 @@ static int stream_writer(const uint8_t* data, size_t data_size,
 }
 
 bool SkWebpEncoder::Encode(SkWStream* stream, const SkPixmap& pixmap, const Options& opts) {
-    if (!SkPixmapIsValid(pixmap, opts.fUnpremulBehavior)) {
+    if (!SkPixmapIsValid(pixmap)) {
         return false;
     }