diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-07 17:06:09 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:06:24 +0000 |
| commit | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (patch) | |
| tree | e97779c04ea0d2059cbd6291de3cbfbf27c1cc61 /bench | |
| parent | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (diff) | |
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 <brianosman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Matt Sarett <msarett@google.com>
>
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 <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/ColorCodecBench.cpp | 2 | ||||
| -rw-r--r-- | bench/GrMipMapBench.cpp | 2 | ||||
| -rw-r--r-- | bench/SkLinearBitmapPipelineBench.cpp | 2 | ||||
| -rw-r--r-- | bench/nanobench.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index 867b8a1418..06afdc6565 100644 --- a/bench/ColorCodecBench.cpp +++ b/bench/ColorCodecBench.cpp @@ -67,7 +67,7 @@ void ColorCodecBench::onDelayedSetup() { fDstSpace = nullptr; if (FLAGS_srgb) { - fDstSpace = SkColorSpace::MakeSRGB(); + fDstSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } else if (FLAGS_nonstd) { SkColorSpaceTransferFn gamma; gamma.fA = 1.0f; diff --git a/bench/GrMipMapBench.cpp b/bench/GrMipMapBench.cpp index 2037495bc0..56b66ced25 100644 --- a/bench/GrMipMapBench.cpp +++ b/bench/GrMipMapBench.cpp @@ -36,7 +36,7 @@ protected: if (nullptr == context) { return; } - auto srgb = SkColorSpace::MakeSRGB(); + auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); SkImageInfo info = SkImageInfo::Make(fW, fH, kN32_SkColorType, kPremul_SkAlphaType, srgb); fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info); diff --git a/bench/SkLinearBitmapPipelineBench.cpp b/bench/SkLinearBitmapPipelineBench.cpp index 29f28895bf..039179823b 100644 --- a/bench/SkLinearBitmapPipelineBench.cpp +++ b/bench/SkLinearBitmapPipelineBench.cpp @@ -93,7 +93,7 @@ struct CommonBitmapFPBenchmark : public Benchmark { sk_ignore_unused_variable(trash); fInfo = SkImageInfo::MakeN32Premul(width, height, fIsSRGB ? - SkColorSpace::MakeSRGB() : nullptr); + SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr); } bool isSuitableFor(Backend backend) override { diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 92475d31f8..0f1e4825e2 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -456,10 +456,10 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c kN32_SkColorType, kPremul_SkAlphaType, nullptr) CPU_CONFIG(565, kRaster_Backend, kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr) - auto srgbColorSpace = SkColorSpace::MakeSRGB(); + auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); CPU_CONFIG(srgb, kRaster_Backend, kN32_SkColorType, kPremul_SkAlphaType, srgbColorSpace) - auto srgbLinearColorSpace = SkColorSpace::MakeSRGBLinear(); + auto srgbLinearColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); CPU_CONFIG(f16, kRaster_Backend, kRGBA_F16_SkColorType, kPremul_SkAlphaType, srgbLinearColorSpace) } |