commit e1adc3a9552c21e7b45b7a910f2a0854e00a92b9
author Brian Osman <brianosman@google.com> Mon Jun 04 09:21:17 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 04 14:07:48 2018 +0000
tree 5744750ccf142f18b84a16b9d28f1ba382d76155
parent 7258e97e8e3af173cc5131f309ae487f663bfd39

Remove color space restrictions from image infos

What makes an info valid (or invalid)? Nothing to do with
color space.

Bug: skia:
Change-Id: I6795efa9aa74ab0d65935c5ddccc1058f8e0b112
Reviewed-on: https://skia-review.googlesource.com/131780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/image/SkImage_Gpu.cpp

diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index ed9021c..4759f4e 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -329,7 +329,7 @@
     // TODO: Create a SkImageColorInfo struct for color, alpha, and color space so we don't need to
     // create a fake image info here.
     SkImageInfo info = SkImageInfo::Make(1, 1, ct, at, cs);
-    if (!SkImageInfoIsValidAllowNumericalCS(info)) {
+    if (!SkImageInfoIsValid(info)) {
         return false;
     }
 
@@ -697,7 +697,7 @@
     }
 
     SkImageInfo info = SkImageInfo::Make(width, height, colorType, alphaType, colorSpace);
-    if (!SkImageInfoIsValidAllowNumericalCS(info)) {
+    if (!SkImageInfoIsValid(info)) {
         return nullptr;
     }
     GrPixelConfig config = kUnknown_GrPixelConfig;

src/image/SkImage_Raster.cpp

diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index f392a83..ca01780 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -315,7 +315,7 @@
 }
 
 sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap& bm, SkCopyPixelsMode cpm) {
-    if (!SkImageInfoIsValidAllowNumericalCS(bm.info()) || bm.rowBytes() < bm.info().minRowBytes()) {
+    if (!SkImageInfoIsValid(bm.info()) || bm.rowBytes() < bm.info().minRowBytes()) {
         return nullptr;
     }
 

src/image/SkSurface_Raster.cpp

diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index a3f69c2..73ff4ba 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -38,10 +38,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkSurfaceValidateRasterInfo(const SkImageInfo& info, size_t rowBytes) {
-    if (!SkImageInfoIsValidCommon(info)) {
-        return false;
-    }
-    if (info.isEmpty()) {
+    if (!SkImageInfoIsValid(info)) {
         return false;
     }
 

src/images/SkImageEncoderPriv.h

diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h
index e6903bc..a7707fe 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()) {

src/images/SkJpegEncoder.cpp

diff --git a/src/images/SkJpegEncoder.cpp b/src/images/SkJpegEncoder.cpp
index 606b553..9c139f7 100644
--- a/src/images/SkJpegEncoder.cpp
+++ b/src/images/SkJpegEncoder.cpp
@@ -181,7 +181,7 @@
 
 std::unique_ptr<SkEncoder> SkJpegEncoder::Make(SkWStream* dst, const SkPixmap& src,
                                                const Options& options) {
-    if (!SkPixmapIsValid(src, options.fBlendBehavior)) {
+    if (!SkPixmapIsValid(src)) {
         return nullptr;
     }
 

src/images/SkPngEncoder.cpp

diff --git a/src/images/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
index 19fc27e..fffda73 100644
--- a/src/images/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -364,7 +364,7 @@
 
 std::unique_ptr<SkEncoder> SkPngEncoder::Make(SkWStream* dst, const SkPixmap& src,
                                               const Options& options) {
-    if (!SkPixmapIsValid(src, options.fUnpremulBehavior)) {
+    if (!SkPixmapIsValid(src)) {
         return nullptr;
     }
 

src/images/SkWebpEncoder.cpp

diff --git a/src/images/SkWebpEncoder.cpp b/src/images/SkWebpEncoder.cpp
index ee13563..2cb55d2 100644
--- a/src/images/SkWebpEncoder.cpp
+++ b/src/images/SkWebpEncoder.cpp
@@ -109,7 +109,7 @@
 }
 
 bool SkWebpEncoder::Encode(SkWStream* stream, const SkPixmap& pixmap, const Options& opts) {
-    if (!SkPixmapIsValid(pixmap, opts.fUnpremulBehavior)) {
+    if (!SkPixmapIsValid(pixmap)) {
         return false;
     }