diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-01-26 13:58:24 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-26 19:52:20 +0000 |
| commit | 333848272c4d023199e44ff38f2e6fc6876388e8 (patch) | |
| tree | 399fd71be826ba4c0a276909fe0e539dd765f435 /src/core/SkColorSpace_XYZ.h | |
| parent | 8f11d4dcafef4447fa68ea0ab28a72589241e9fd (diff) | |
remove SkColorSpace_Base
The type SkColorSpace_Base doesn't need to exist. Its one type() query
can be answered instead by toXYZD50().
Now all that's left in the file is SkGammas, so rename it to SkGammas.h.
Change-Id: Id60ddbfb342accfd5674ae89b37a24a6583ef7b8
Reviewed-on: https://skia-review.googlesource.com/99702
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/core/SkColorSpace_XYZ.h')
| -rw-r--r-- | src/core/SkColorSpace_XYZ.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/SkColorSpace_XYZ.h b/src/core/SkColorSpace_XYZ.h index 78b048e4f7..2ad2e38b1b 100644 --- a/src/core/SkColorSpace_XYZ.h +++ b/src/core/SkColorSpace_XYZ.h @@ -8,11 +8,12 @@ #ifndef SkColorSpace_XYZ_DEFINED #define SkColorSpace_XYZ_DEFINED -#include "SkColorSpace_Base.h" +#include "SkColorSpace.h" #include "SkData.h" +#include "SkGammas.h" #include "SkOnce.h" -class SkColorSpace_XYZ : public SkColorSpace_Base { +class SkColorSpace_XYZ : public SkColorSpace { public: const SkMatrix44* onToXYZD50() const override { return &fToXYZD50; } uint32_t onToXYZD50Hash() const override { return fToXYZD50Hash; } @@ -25,8 +26,6 @@ public: const SkData* onProfileData() const override { return fProfileData.get(); } - Type type() const override { return Type::kXYZ; } - sk_sp<SkColorSpace> makeLinearGamma() const override; sk_sp<SkColorSpace> makeSRGBGamma() const override; sk_sp<SkColorSpace> makeColorSpin() const override; @@ -58,9 +57,7 @@ private: mutable SkOnce fToDstGammaOnce; friend class SkColorSpace; - friend class SkColorSpace_Base; friend class ColorSpaceXformTest; - typedef SkColorSpace_Base INHERITED; }; #endif |