aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/skiaserve
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2016-10-24 09:24:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-10-24 14:02:27 +0000
commit526972ecb5411b84ba2f5e20252f178f9ee2151f (patch)
treeef89b6a40fcdf90ae8e0b00b8f7d247510e03656 /tools/skiaserve
parent09732a6b0e7c4b087279095762f9d27a4f556aba (diff)
Rename all color space factories from New* to Make*
Matches our naming convention for all other types - factories that return sk_sp (or any type that intelligently manages its own lifetime) are named Make. Previous factories are still around, assuming SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES is defined. Enable that define for Android, etc. See also: https://codereview.chromium.org/2442053002/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3822 Change-Id: Iaea9376490736b494e8ffc820831f052bbe1478d Reviewed-on: https://skia-review.googlesource.com/3822 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'tools/skiaserve')
-rw-r--r--tools/skiaserve/Request.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 487da35424..9da9f0f859 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -178,8 +178,8 @@ SkSurface* Request::createCPUSurface() {
SkIRect bounds = this->getBounds();
ColorAndProfile cap = ColorModes[fColorMode];
auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType
- ? SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named)
- : SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+ ? 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();
@@ -190,8 +190,8 @@ SkSurface* Request::createGPUSurface() {
SkIRect bounds = this->getBounds();
ColorAndProfile cap = ColorModes[fColorMode];
auto colorSpace = kRGBA_F16_SkColorType == cap.fColorType
- ? SkColorSpace::NewNamed(SkColorSpace::kSRGBLinear_Named)
- : SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+ ? 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();