From 3e50027f2269195a08e6dd861f504ec5b90b4279 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Fri, 10 Feb 2017 15:11:12 -0500 Subject: Delete legacy named color space API BUG=skia: Change-Id: I3a41b5affdfad830cea969a1e4932794d27f4f7a Reviewed-on: https://skia-review.googlesource.com/8331 Reviewed-by: Brian Osman Commit-Queue: Matt Sarett --- gn/android_framework_defines.gni | 1 - include/core/SkColorSpace.h | 30 ------------------------------ src/core/SkColorSpace.cpp | 6 ------ 3 files changed, 37 deletions(-) diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 45241d8e6b..b693d2808d 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -16,5 +16,4 @@ android_framework_defines = [ "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER", "SK_SUPPORT_EXOTIC_CLIPOPS", - "SK_USE_LEGACY_NAMED_COLOR_SPACE", ] diff --git a/include/core/SkColorSpace.h b/include/core/SkColorSpace.h index 0399ca8c72..8cc20c40c9 100644 --- a/include/core/SkColorSpace.h +++ b/include/core/SkColorSpace.h @@ -53,36 +53,6 @@ struct SK_API SkColorSpaceTransferFn { class SK_API SkColorSpace : public SkRefCnt { public: -#ifdef SK_USE_LEGACY_NAMED_COLOR_SPACE - /** - * Common, named profiles that we can recognize. - */ - enum Named : uint8_t { - /** - * By far the most common color space. - * This is the default space for images, unmarked content, and monitors. - */ - kSRGB_Named, - - /** - * Very common wide gamut color space. - * Often used by images and monitors. - */ - kAdobeRGB_Named, - - /** - * Colorspace with the sRGB primaries, but a linear (1.0) gamma. Commonly used for - * half-float surfaces, and high precision individual colors (gradient stops, etc...) - */ - kSRGBLinear_Named, - }; - - /** - * Create a common, named SkColorSpace. - */ - static sk_sp MakeNamed(Named); -#endif - /** * Create the sRGB color space. */ diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp index 645410c496..6c0890f178 100644 --- a/src/core/SkColorSpace.cpp +++ b/src/core/SkColorSpace.cpp @@ -199,12 +199,6 @@ static SkColorSpace* gAdobeRGB; static SkColorSpace* gSRGB; static SkColorSpace* gSRGBLinear; -#ifdef SK_USE_LEGACY_NAMED_COLOR_SPACE -sk_sp SkColorSpace::MakeNamed(Named named) { - return SkColorSpace_Base::MakeNamed((SkColorSpace_Base::Named) named); -} -#endif - sk_sp SkColorSpace_Base::MakeNamed(Named named) { static SkOnce sRGBOnce; static SkOnce adobeRGBOnce; -- cgit v1.2.3