From 526972ecb5411b84ba2f5e20252f178f9ee2151f Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 24 Oct 2016 09:24:02 -0400 Subject: 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 Reviewed-by: Mike Reed --- tools/flags/SkCommonFlagsConfig.cpp | 12 ++++++------ tools/picture_utils.cpp | 2 +- tools/skiaserve/Request.cpp | 8 ++++---- tools/viewer/ImageSlide.cpp | 2 +- tools/viewer/Viewer.cpp | 2 +- tools/viewer/sk_app/VulkanWindowContext.cpp | 2 +- tools/viewer/sk_app/WindowContext.cpp | 2 +- tools/viewer/sk_app/android/GLWindowContext_android.cpp | 2 +- tools/visualize_color_gamut.cpp | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tools') diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index f695bf1578..147f6f0c26 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -285,8 +285,8 @@ static bool parse_option_gpu_color(const SkString& value, // First, figure out color gamut that we'll work in (default to sRGB) const bool linearGamma = commands[0].equals("f16"); - *outColorSpace = SkColorSpace::NewNamed(linearGamma ? SkColorSpace::kSRGBLinear_Named - : SkColorSpace::kSRGB_Named); + *outColorSpace = SkColorSpace::MakeNamed(linearGamma ? SkColorSpace::kSRGBLinear_Named + : SkColorSpace::kSRGB_Named); if (commands.count() == 2) { if (commands[1].equals("srgb")) { // sRGB gamut (which is our default) @@ -299,10 +299,10 @@ static bool parse_option_gpu_color(const SkString& value, }; SkMatrix44 wideGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor); wideGamutRGBMatrix.set3x3RowMajorf(gWideGamutRGB_toXYZD50); - *outColorSpace = SkColorSpace::NewRGB(linearGamma + *outColorSpace = SkColorSpace::MakeRGB(linearGamma ? SkColorSpace::kLinear_RenderTargetGamma : SkColorSpace::kSRGB_RenderTargetGamma, - wideGamutRGBMatrix); + wideGamutRGBMatrix); } else if (commands[1].equals("narrow")) { // NarrowGamut RGB (an artifically smaller than sRGB gamut) SkColorSpacePrimaries primaries ={ @@ -313,10 +313,10 @@ static bool parse_option_gpu_color(const SkString& value, }; SkMatrix44 narrowGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor); primaries.toXYZD50(&narrowGamutRGBMatrix); - *outColorSpace = SkColorSpace::NewRGB(linearGamma + *outColorSpace = SkColorSpace::MakeRGB(linearGamma ? SkColorSpace::kLinear_RenderTargetGamma : SkColorSpace::kSRGB_RenderTargetGamma, - narrowGamutRGBMatrix); + narrowGamutRGBMatrix); } else { // Unknown color gamut return false; diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index 453320122b..b252f8da62 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -79,7 +79,7 @@ namespace sk_tools { SkAutoTMalloc rgba(w*h); - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); if (bitmap. colorType() == kN32_SkColorType && bitmap.colorSpace() == srgbColorSpace.get()) { // These are premul sRGB 8-bit pixels in SkPMColor order. 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(); diff --git a/tools/viewer/ImageSlide.cpp b/tools/viewer/ImageSlide.cpp index 78fb17b4b0..e70f618487 100644 --- a/tools/viewer/ImageSlide.cpp +++ b/tools/viewer/ImageSlide.cpp @@ -46,7 +46,7 @@ void ImageSlide::load(SkScalar, SkScalar) { codec->getPixels(codec->getInfo(), fOriginalBitmap.getPixels(), fOriginalBitmap.rowBytes()); SkImageInfo xformedInfo = codec->getInfo().makeColorSpace( - SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named)); + SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named)); fXformedBitmap.allocPixels(xformedInfo); codec->getPixels(xformedInfo, fXformedBitmap.getPixels(), fXformedBitmap.rowBytes()); } diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index cd78676def..739882d7d2 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -164,7 +164,7 @@ Viewer::Viewer(int argc, char** argv, void* platformData) fCommands.addCommand('c', "Modes", "Toggle sRGB color mode", [this]() { DisplayParams params = fWindow->getDisplayParams(); params.fColorSpace = (nullptr == params.fColorSpace) - ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr; + ? SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr; fWindow->setDisplayParams(params); this->updateTitle(); fWindow->inval(); diff --git a/tools/viewer/sk_app/VulkanWindowContext.cpp b/tools/viewer/sk_app/VulkanWindowContext.cpp index dc93623ade..8ce54f0b56 100644 --- a/tools/viewer/sk_app/VulkanWindowContext.cpp +++ b/tools/viewer/sk_app/VulkanWindowContext.cpp @@ -170,7 +170,7 @@ bool VulkanWindowContext::createSwapchain(int width, int height, // Pick our surface format. For now, just make sure it matches our sRGB request: VkFormat surfaceFormat = VK_FORMAT_UNDEFINED; VkColorSpaceKHR colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); bool wantSRGB = srgbColorSpace == params.fColorSpace; for (uint32_t i = 0; i < surfaceFormatCount; ++i) { GrPixelConfig config; diff --git a/tools/viewer/sk_app/WindowContext.cpp b/tools/viewer/sk_app/WindowContext.cpp index b5039a3970..e8658806e3 100755 --- a/tools/viewer/sk_app/WindowContext.cpp +++ b/tools/viewer/sk_app/WindowContext.cpp @@ -42,7 +42,7 @@ sk_sp WindowContext::createSurface( fWidth, fHeight, fDisplayParams.fColorType, kPremul_SkAlphaType, - forceSRGB ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) + forceSRGB ? SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : fDisplayParams.fColorSpace ); if (this->isGpuContext()) { diff --git a/tools/viewer/sk_app/android/GLWindowContext_android.cpp b/tools/viewer/sk_app/android/GLWindowContext_android.cpp index 3348d803e0..9f683968c6 100644 --- a/tools/viewer/sk_app/android/GLWindowContext_android.cpp +++ b/tools/viewer/sk_app/android/GLWindowContext_android.cpp @@ -102,7 +102,7 @@ void GLWindowContext_android::onInitializeContext() { EGL_NONE, }; const EGLint* windowAttribs = nullptr; - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); if (srgbColorSpace == fDisplayParams.fColorSpace && majorVersion == 1 && minorVersion >= 2) { windowAttribs = srgbWindowAttribs; } diff --git a/tools/visualize_color_gamut.cpp b/tools/visualize_color_gamut.cpp index 6d08ba213b..9e9ed96314 100644 --- a/tools/visualize_color_gamut.cpp +++ b/tools/visualize_color_gamut.cpp @@ -140,7 +140,7 @@ int main(int argc, char** argv) { // Draw the sRGB gamut if requested. if (FLAGS_sRGB) { - sk_sp sRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + sk_sp sRGBSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); const SkMatrix44* mat = as_CSB(sRGBSpace)->toXYZD50(); SkASSERT(mat); draw_gamut(&canvas, *mat, "sRGB", 0xFFFF9394, false); @@ -148,7 +148,7 @@ int main(int argc, char** argv) { // Draw the Adobe RGB gamut if requested. if (FLAGS_adobeRGB) { - sk_sp adobeRGBSpace = SkColorSpace::NewNamed(SkColorSpace::kAdobeRGB_Named); + sk_sp adobeRGBSpace = SkColorSpace::MakeNamed(SkColorSpace::kAdobeRGB_Named); const SkMatrix44* mat = as_CSB(adobeRGBSpace)->toXYZD50(); SkASSERT(mat); draw_gamut(&canvas, *mat, "Adobe RGB", 0xFF31a9e1, false); @@ -158,7 +158,7 @@ int main(int argc, char** argv) { sk_sp colorSpace = sk_ref_sp(codec->getInfo().colorSpace()); if (!colorSpace) { SkDebugf("Image had no embedded color space information. Defaulting to sRGB.\n"); - colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); } const SkMatrix44* mat = as_CSB(colorSpace)->toXYZD50(); SkASSERT(mat); -- cgit v1.2.3