From 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Tue, 7 Feb 2017 17:06:09 +0000 Subject: Revert "SkColorSpace: remove named API, add gamut API" This reverts commit ecaaf6f1c156e5690200322fc2636380c1f63dd8. Reason for revert: Breaks everything Original change's description: > SkColorSpace: remove named API, add gamut API > > BUG=skia: > > Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6 > Reviewed-on: https://skia-review.googlesource.com/8021 > Reviewed-by: Brian Osman > Reviewed-by: Mike Reed > Commit-Queue: Matt Sarett > TBR=msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: Ief5a0a4eeabe75a21f7512e23fc15309151066c4 Reviewed-on: https://skia-review.googlesource.com/8127 Commit-Queue: Matt Sarett Reviewed-by: Matt Sarett --- tools/skiaserve/Request.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/skiaserve') diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index 0fbccc39b3..ff8849ad96 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -179,8 +179,8 @@ SkSurface* Request::createCPUSurface() { SkIRect bounds = this->getBounds(); ColorAndProfile cap = ColorModes[fColorMode]; auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType - ? SkColorSpace::MakeSRGBLinear() - : SkColorSpace::MakeSRGB(); + ? SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named) + : SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(), cap.fColorType, kPremul_SkAlphaType, cap.fSRGB ? colorSpace : nullptr); return SkSurface::MakeRaster(info).release(); @@ -191,8 +191,8 @@ SkSurface* Request::createGPUSurface() { SkIRect bounds = this->getBounds(); ColorAndProfile cap = ColorModes[fColorMode]; auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType - ? SkColorSpace::MakeSRGBLinear() - : SkColorSpace::MakeSRGB(); + ? SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named) + : SkColorSpace::MakeNamed(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(); -- cgit v1.2.3