diff options
| author |  raftias <raftias@google.com> | 2016-10-13 10:45:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-13 10:45:44 -0700 |
| commit | 7c602de058c6332dfd92b70a3d05d4a3c401a3ae (patch) | |
| tree | 3c171fe31e352c89c9dbb855b13a33b92265c715 /tools/skiaserve | |
| parent | 16d2c67fa10f09a88b33df2cd88f349da52c9a9a (diff) | |
Removed makeLinearGamma() from the public API for SkColorSpace
It will now reside in SkColorSpace_Base. Future work for SkColorSpace
will cause this function to not be desirable or sensible to call on
all SkColorSpaces. Call sites were changed to make a kSRGBLinear_Named
instead of kSRGB_Named -> makeLinearGamma() (the majority of cases),
and if that was not possible, SkColorSpace_Base::makeLinearGamma()
was called instead.
TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2412613005
Review-Url: https://codereview.chromium.org/2412613005
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Request.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index ef1f757595..d27f2c0792 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -174,10 +174,9 @@ ColorAndProfile ColorModes[] = { SkSurface* Request::createCPUSurface() { SkIRect bounds = this->getBounds(); ColorAndProfile cap = ColorModes[fColorMode]; - auto colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - if (kRGBA_F16_SkColorType == cap.fColorType) { - colorSpace = colorSpace->makeLinearGamma(); - } + auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType + ? SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named) + : SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(), cap.fColorType, kPremul_SkAlphaType, cap.fSRGB ? colorSpace : nullptr); return SkSurface::MakeRaster(info).release(); @@ -187,10 +186,9 @@ SkSurface* Request::createGPUSurface() { GrContext* context = this->getContext(); SkIRect bounds = this->getBounds(); ColorAndProfile cap = ColorModes[fColorMode]; - auto colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); - if (kRGBA_F16_SkColorType == cap.fColorType) { - colorSpace = colorSpace->makeLinearGamma(); - } + auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType + ? SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named) + : SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(), cap.fColorType, kPremul_SkAlphaType, cap.fSRGB ? colorSpace: nullptr); SkSurface* surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info).release(); |