remove SK_SUPPORT_LEGACY_COLORPROFILETYPE dead-code

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2101983003

TBR=

Review-Url: https://codereview.chromium.org/2101983003

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 8b499097e9e030a5113f17839a729fbc03117dcb..5406f9432887eaa1bda88ad5792511abfd97a09a 100644 (file)
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -86,9 +86,6 @@ public:
     SkColorType colorType() const { return fInfo.colorType(); }
     SkAlphaType alphaType() const { return fInfo.alphaType(); }
     SkColorSpace* colorSpace() const { return fInfo.colorSpace(); }
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
-    SkColorProfileType profileType() const { return fInfo.profileType(); }
-#endif
 
     /**
      *  Return the number of bytes per pixel based on the colortype. If the colortype is

diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index b45ee38ee182e0382076728c2f0298df26dbdb0e..f143503c6611a4650b0eb565e2d78dd9dcf4d733 100644 (file)
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -169,15 +169,6 @@ enum SkYUVColorSpace {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
-enum SkColorProfileType {
-    kLinear_SkColorProfileType,
-    kSRGB_SkColorProfileType,
-
-    kLastEnum_SkColorProfileType = kSRGB_SkColorProfileType
-};
-#endif
-
 enum class SkSourceGammaTreatment {
     kRespect,
     kIgnore,
@@ -238,41 +229,6 @@ public:
         return MakeUnknown(0, 0);
     }
     
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
-    static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
-                            SkColorProfileType pt) {
-        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
-        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
-        return Make(width, height, ct, at, cs);
-    }
-
-    static SkImageInfo MakeN32(int width, int height, SkAlphaType at, SkColorProfileType pt) {
-        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
-                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
-        return SkImageInfo(width, height, kN32_SkColorType, at, cs);
-    }
-
-    /**
-     *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
-     */
-    static SkImageInfo MakeN32Premul(int width, int height, SkColorProfileType pt) {
-        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
-                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
-        return Make(width, height, kN32_SkColorType, kPremul_SkAlphaType, cs);
-    }
-
-    /**
-     *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
-     */
-    static SkImageInfo MakeN32Premul(const SkISize& size, SkColorProfileType pt) {
-        return MakeN32Premul(size.width(), size.height(), pt);
-    }
-
-    SkColorProfileType profileType() const;
-    bool isLinear() const { return kLinear_SkColorProfileType == this->profileType(); }
-    bool isSRGB() const { return kSRGB_SkColorProfileType == this->profileType(); }
-#endif
-
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     SkColorType colorType() const { return fColorType; }

diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index ba418d519840d036f64f3e7173d3fcaff8796ac7..b3b9c385d8a13eaf14fe78d11f8393c07bb924ed 100644 (file)
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -9,13 +9,6 @@
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
-SkColorProfileType SkImageInfo::profileType() const {
-    return fColorSpace && fColorSpace->gammaCloseToSRGB()
-            ? kSRGB_SkColorProfileType : kLinear_SkColorProfileType;
-}
-#endif
-
 static bool alpha_type_is_valid(SkAlphaType alphaType) {
     return (alphaType >= 0) && (alphaType <= kLastEnum_SkAlphaType);
 }