diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-21 13:40:25 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-21 21:01:35 +0000 |
| commit | e9edf8cc50e50998f7074023f974ec034cfcec4c (patch) | |
| tree | 945ec982008e0f88c0b40c76e172de2387899e4f /src/core/SkColorSpace_XYZ.cpp | |
| parent | 4aa4441186b06565a597ec4a9baac5a972fddb51 (diff) | |
Remove more functionality from SkColorSpace_Base
Push profile data into XYZ and A2B classes
Move SkColorSpace_Base::MakeRGB to SkColorSpace
Bug: skia:
Change-Id: I4782eb2a5c77b54d302e1982654755015dea7651
Reviewed-on: https://skia-review.googlesource.com/88560
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/core/SkColorSpace_XYZ.cpp')
| -rw-r--r-- | src/core/SkColorSpace_XYZ.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkColorSpace_XYZ.cpp b/src/core/SkColorSpace_XYZ.cpp index 34a93f7047..105ed0f425 100644 --- a/src/core/SkColorSpace_XYZ.cpp +++ b/src/core/SkColorSpace_XYZ.cpp @@ -11,7 +11,7 @@ #include "SkOpts.h" SkColorSpace_XYZ::SkColorSpace_XYZ(SkGammaNamed gammaNamed, const SkMatrix44& toXYZD50) - : INHERITED(nullptr) + : fProfileData(nullptr) , fGammaNamed(gammaNamed) , fGammas(nullptr) , fToXYZD50(toXYZD50) @@ -21,7 +21,7 @@ SkColorSpace_XYZ::SkColorSpace_XYZ(SkGammaNamed gammaNamed, const SkMatrix44& to SkColorSpace_XYZ::SkColorSpace_XYZ(SkGammaNamed gammaNamed, sk_sp<SkGammas> gammas, const SkMatrix44& toXYZD50, sk_sp<SkData> profileData) - : INHERITED(std::move(profileData)) + : fProfileData(std::move(profileData)) , fGammaNamed(gammaNamed) , fGammas(std::move(gammas)) , fToXYZD50(toXYZD50) @@ -86,14 +86,14 @@ sk_sp<SkColorSpace> SkColorSpace_XYZ::makeLinearGamma() const { if (this->gammaIsLinear()) { return sk_ref_sp(const_cast<SkColorSpace_XYZ*>(this)); } - return SkColorSpace_Base::MakeRGB(kLinear_SkGammaNamed, fToXYZD50); + return SkColorSpace::MakeRGB(kLinear_SkGammaNamed, fToXYZD50); } sk_sp<SkColorSpace> SkColorSpace_XYZ::makeSRGBGamma() const { if (this->gammaCloseToSRGB()) { return sk_ref_sp(const_cast<SkColorSpace_XYZ*>(this)); } - return SkColorSpace_Base::MakeRGB(kSRGB_SkGammaNamed, fToXYZD50); + return SkColorSpace::MakeRGB(kSRGB_SkGammaNamed, fToXYZD50); } sk_sp<SkColorSpace> SkColorSpace_XYZ::makeColorSpin() const { |