More removal of SkColorProfileType...

Scrub GMs. Remove the gDefaultProfile thing (it's unused now), along with
the command line flag that was setting it in DM and nanobench.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2071393002

Committed: https://skia.googlesource.com/skia/+/944876f2745a62a839e49275daf93a0329372e67
Review-Url: https://codereview.chromium.org/2071393002

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 94402cc770488c7c5c34f7bf207d81ddda7b579a..cb28231adb367959a6fe164a54ffa9e812490b72 100644 (file)
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -1025,8 +1025,6 @@ static void start_keepalive() {
     intentionallyLeaked->start();
 }
 
-extern bool gDefaultProfileIsSRGB;
-
 int nanobench_main();
 int nanobench_main() {
     SetupCrashHandler();
@@ -1038,10 +1036,6 @@ int nanobench_main() {
     gGrFactory.reset(new GrContextFactory(grContextOpts));
 #endif
 
-    if (FLAGS_forceSRGB) {
-        gDefaultProfileIsSRGB = true;
-    }
-
     if (FLAGS_veryVerbose) {
         FLAGS_verbose = true;
     }

diff --git a/dm/DM.cpp b/dm/DM.cpp
index f6dc398bea991e5e0ffb0debd76b02218a0041ca..210badc1b21f5bcc6d0c3756bed9e9fe32389880 100644 (file)
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1251,8 +1251,6 @@ static sk_sp<SkTypeface> create_from_name(const char familyName[], SkFontStyle s
 
 extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle );
 
-extern bool gDefaultProfileIsSRGB;
-
 int dm_main();
 int dm_main() {
     setbuf(stdout, nullptr);
@@ -1265,10 +1263,6 @@ int dm_main() {
         gVLog = freopen(SkOSPath::Join(FLAGS_writePath[0], "verbose.log").c_str(), "w", stderr);
     }
 
-    if (FLAGS_forceSRGB) {
-        gDefaultProfileIsSRGB = true;
-    }
-
     JsonWriter::DumpJson();  // It's handy for the bots to assume this is ~never missing.
     SkAutoGraphics ag;
     SkTaskGroup::Enabler enabled(FLAGS_threads);

diff --git a/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp
index 777f8257805915d3f9d9b171ab2c96e410cc75c0..c78bc74e23fa93a6bbc82dace596b0a6d8588b62 100644 (file)
--- a/gm/SkLinearBitmapPipelineGM.cpp
+++ b/gm/SkLinearBitmapPipelineGM.cpp
@@ -55,7 +55,7 @@ static void draw_rect_orig(SkCanvas* canvas, const SkRect& r, SkColor c, const S
     SkPixmap pmdst;
     bmdst.peekPixels(&pmdst);
 
-    SkImageInfo info = SkImageInfo::MakeN32Premul(ir.width(), ir.height(), kLinear_SkColorProfileType);
+    SkImageInfo info = SkImageInfo::MakeN32Premul(ir.width(), ir.height());
 
     sk_sp<SkImage> image(SkImage::MakeRasterCopy(SkPixmap(info, pmsrc.addr32(), pmsrc.rowBytes())));
     SkPaint paint;
@@ -113,9 +113,6 @@ static void draw_rect_fp(SkCanvas* canvas, const SkRect& r, SkColor c, const SkM
     }
 
     uint32_t flags = 0;
-    //if (kSRGB_SkColorProfileType == profile) {
-        //flags |= SkXfermode::kDstIsSRGB_PM4fFlag;
-    //}
     auto procN = SkXfermode::GetD32Proc(nullptr, flags);
 
     SkLinearBitmapPipeline pipeline{

diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp
index 7ea17466d928ec42bf64a520c250bcc0d18c3fc1..b657f4fa7c4ceaa8f600e5bcfa9c0640625b35ca 100644 (file)
--- a/gm/all_bitmap_configs.cpp
+++ b/gm/all_bitmap_configs.cpp
@@ -246,13 +246,13 @@ static uint32_t make_pixel(int x, int y, SkAlphaType alphaType) {
 static void make_color_test_bitmap_variant(
     SkColorType colorType,
     SkAlphaType alphaType,
-    SkColorProfileType profile,
+    sk_sp<SkColorSpace> colorSpace,
     SkBitmap* bm)
 {
     SkASSERT(colorType == kRGBA_8888_SkColorType || colorType == kBGRA_8888_SkColorType);
     SkASSERT(alphaType == kPremul_SkAlphaType || alphaType == kUnpremul_SkAlphaType);
     bm->allocPixels(
-        SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, profile));
+        SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, colorSpace));
     SkPixmap pm;
     bm->peekPixels(&pm);
     for (int y = 0; y < bm->height(); y++) {
@@ -265,13 +265,17 @@ static void make_color_test_bitmap_variant(
 DEF_SIMPLE_GM(all_variants_8888, canvas, 4 * SCALE + 30, 2 * SCALE + 10) {
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
 
-    for (auto profile : {kSRGB_SkColorProfileType, kLinear_SkColorProfileType}) {
+    sk_sp<SkColorSpace> colorSpaces[] {
+        nullptr,
+        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)
+    };
+    for (auto colorSpace : colorSpaces) {
         canvas->save();
         for (auto alphaType : {kPremul_SkAlphaType, kUnpremul_SkAlphaType}) {
             canvas->save();
             for (auto colorType : {kRGBA_8888_SkColorType, kBGRA_8888_SkColorType}) {
                 SkBitmap bm;
-                make_color_test_bitmap_variant(colorType, alphaType, profile, &bm);
+                make_color_test_bitmap_variant(colorType, alphaType, colorSpace, &bm);
                 canvas->drawBitmap(bm, 0.0f, 0.0f);
                 canvas->translate(SCALE + 10, 0.0f);
             }

diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index 33d837786a2e2d42c95c714b5e882fe0d73cca8e..5a516a569b640a4119faef643b877ac11b86c1fe 100644 (file)
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -73,10 +73,13 @@ DEF_SIMPLE_GM(color4f, canvas, 1024, 260) {
     // even if it holds sRGB values.
     bg.setColor(0xFFFFFFFF);
 
-    SkColorProfileType const profiles[] { kLinear_SkColorProfileType, kSRGB_SkColorProfileType };
-    for (auto profile : profiles) {
+    sk_sp<SkColorSpace> colorSpaces[]{
+        nullptr,
+        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)
+    };
+    for (auto colorSpace : colorSpaces) {
         const SkImageInfo info = SkImageInfo::Make(1024, 100, kN32_SkColorType, kPremul_SkAlphaType,
-                                                   profile);
+                                                   colorSpace);
         auto surface(SkSurface::MakeRaster(info));
         surface->getCanvas()->drawPaint(bg);
         draw_into_canvas(surface->getCanvas());

diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index 05aef4c9d6f07a9bd78bb653685accfc094837b3..42d650ed2f4508189089336ee1a1e2b8878ef3ea 100644 (file)
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -48,8 +48,9 @@ protected:
         // set up offscreen rendering with distance field text
 #if SK_SUPPORT_GPU
         GrContext* ctx = inputCanvas->getGrContext();
-        SkImageInfo info = SkImageInfo::MakeN32Premul(onISize(),
-                                                      inputCanvas->imageInfo().profileType());
+        SkISize size = onISize();
+        SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType,
+                                                sk_ref_sp(inputCanvas->imageInfo().colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         uint32_t gammaCorrect = inputCanvas->getProps(&canvasProps)
             ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0;

diff --git a/gm/gamma.cpp b/gm/gamma.cpp
index c9fa28be104f87e1cf72c4710b03296893440101..eb4c7607feb1e4b9d9d3a2a488595dd9c215e84c 100644 (file)
--- a/gm/gamma.cpp
+++ b/gm/gamma.cpp
@@ -18,6 +18,7 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
     const SkScalar tx = sz + 5.0f;
     const SkRect r = SkRect::MakeXYWH(0, 0, sz, sz);
     SkShader::TileMode rpt = SkShader::kRepeat_TileMode;
+    auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
 
     SkBitmap ditherBmp;
     ditherBmp.allocN32Pixels(2, 2);
@@ -26,21 +27,20 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
     pixels[1] = pixels[2] = SkPackARGB32(0xFF, 0, 0, 0);
 
     SkBitmap linearGreyBmp;
-    SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType,
-                                                      kLinear_SkColorProfileType);
+    SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType, nullptr);
     linearGreyBmp.allocPixels(linearGreyInfo);
     linearGreyBmp.eraseARGB(0xFF, 0x7F, 0x7F, 0x7F);
 
     SkBitmap srgbGreyBmp;
     SkImageInfo srgbGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType,
-                                                    kSRGB_SkColorProfileType);
+                                                    srgbColorSpace);
     srgbGreyBmp.allocPixels(srgbGreyInfo);
     // 0xBC = 255 * linear_to_srgb(0.5f)
     srgbGreyBmp.eraseARGB(0xFF, 0xBC, 0xBC, 0xBC);
 
     SkBitmap mipmapBmp;
     SkImageInfo mipmapInfo = SkImageInfo::Make(2, 2, kN32_SkColorType, kOpaque_SkAlphaType,
-                                               SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named));
+                                               srgbColorSpace);
     mipmapBmp.allocPixels(mipmapInfo);
     SkPMColor* mipmapPixels = reinterpret_cast<SkPMColor*>(mipmapBmp.getPixels());
     unsigned s25 = 0x89;    // 255 * linear_to_srgb(0.25f)

diff --git a/gm/surface.cpp b/gm/surface.cpp
index 15d362efd5942d1112b805656c676f69a05460a4..bae77c55946465dea63543141584bc7ef314bae2 100644 (file)
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -78,7 +78,7 @@ protected:
 
         // must be opaque to have a hope of testing LCD text
         const SkImageInfo info = SkImageInfo::MakeN32(W, H, kOpaque_SkAlphaType,
-                                                      canvas->imageInfo().profileType());
+                                                      sk_ref_sp(canvas->imageInfo().colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         bool gammaCorrect = canvas->getProps(&canvasProps) && canvasProps.isGammaCorrect();
 

diff --git a/gm/textblobgeometrychange.cpp b/gm/textblobgeometrychange.cpp
index 87c432f5b740ea958103c0d422c90fdeb645087d..a241c5c7ba611f659c169da7a1e67842bf4ef606 100644 (file)
--- a/gm/textblobgeometrychange.cpp
+++ b/gm/textblobgeometrychange.cpp
@@ -42,7 +42,8 @@ protected:
 
         SkAutoTUnref<const SkTextBlob> blob(builder.build());
 
-        SkImageInfo info = SkImageInfo::MakeN32Premul(200, 200, canvas->imageInfo().profileType());
+        SkImageInfo info = SkImageInfo::MakeN32(200, 200, kPremul_SkAlphaType,
+                                                sk_ref_sp(canvas->imageInfo().colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         uint32_t gammaCorrect = canvas->getProps(&canvasProps)
             ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0;

diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index 8f5dc85e48226187401f2fb82dd4e6a5312f82a4..8fdf558206136383eef6ceda8a8f438806747f71 100644 (file)
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -102,8 +102,10 @@ protected:
 #if SK_SUPPORT_GPU
             // Create a new Canvas to enable DFT
             GrContext* ctx = inputCanvas->getGrContext();
-            SkImageInfo info = SkImageInfo::MakeN32Premul(onISize(),
-                                                          inputCanvas->imageInfo().profileType());
+            SkISize size = onISize();
+            sk_sp<SkColorSpace> colorSpace = sk_ref_sp(inputCanvas->imageInfo().colorSpace());
+            SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(),
+                                                    kPremul_SkAlphaType, colorSpace);
             SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
             uint32_t gammaCorrect = inputCanvas->getProps(&canvasProps)
                 ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0;

diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp
index 2a6fc8e8329a1646024bb5a453160952b33f5c09..58f0dc6bd6b790eccd2c5aee3b20b4d481d40f05 100644 (file)
--- a/gm/textblobrandomfont.cpp
+++ b/gm/textblobrandomfont.cpp
@@ -97,8 +97,8 @@ protected:
 
         canvas->drawColor(sk_tool_utils::color_to_565(SK_ColorWHITE));
 
-        SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight,
-                                                      canvas->imageInfo().profileType());
+        SkImageInfo info = SkImageInfo::MakeN32(kWidth, kHeight, kPremul_SkAlphaType,
+                                                sk_ref_sp(canvas->imageInfo().colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         uint32_t gammaCorrect = canvas->getProps(&canvasProps)
             ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0;

diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp
index 2b554b6c11474d596ea5eba8e9e7476e27b8868d..642175e5a18b1b4c86da65f4aaa9a4f68e375ad9 100644 (file)
--- a/gm/xfermodes3.cpp
+++ b/gm/xfermodes3.cpp
@@ -126,7 +126,7 @@ private:
         GrContext* context = baseCanvas->getGrContext();
         SkImageInfo baseInfo = baseCanvas->imageInfo();
         SkImageInfo info = SkImageInfo::Make(w, h, baseInfo.colorType(), baseInfo.alphaType(),
-                                             baseInfo.profileType());
+                                             sk_ref_sp(baseInfo.colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         baseCanvas->getProps(&canvasProps);
         return SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info, 0, &canvasProps);

diff --git a/gyp/core.gypi b/gyp/core.gypi
index d3102e4f926047ec8c6ff2f4db0f7ebe4617a596..516faf3095b11a47bf474d109d79dedd86e5d930 100644 (file)
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -421,7 +421,6 @@
         '<(skia_include_path)/private/SkFloatBits.h',
         '<(skia_include_path)/private/SkFloatingPoint.h',
         '<(skia_include_path)/private/SkGpuFenceSync.h',
-        '<(skia_include_path)/private/SkImageInfoPriv.h',
         '<(skia_include_path)/private/SkMiniRecorder.h',
         '<(skia_include_path)/private/SkMutex.h',
         '<(skia_include_path)/private/SkOnce.h',

diff --git a/include/private/SkImageInfoPriv.h b/include/private/SkImageInfoPriv.h
deleted file mode 100644 (file)
index 89e6e20..0000000
--- a/include/private/SkImageInfoPriv.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkImageInfoPriv_DEFINED
-#define SkImageInfoPriv_DEFINED
-
-#include "SkImageInfo.h"
-
-SK_API SkColorProfileType SkDefaultColorProfile();
-
-#endif  // SkImageInfoPriv_DEFINED

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 4150a9a55b663584879600346610b2d042259824..1a5c4c4d112964041b2dab85064935629085e9c1 100644 (file)
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1177,6 +1177,7 @@ static SkImageInfo make_layer_info(const SkImageInfo& prev, int w, int h, bool i
                                    const SkPaint* paint) {
     // need to force L32 for now if we have an image filter. Once filters support other colortypes
     // e.g. sRGB or F16, we can remove this check
+    // SRGBTODO: Can we remove this check now?
     const bool hasImageFilter = paint && paint->getImageFilter();
 
     SkAlphaType alphaType = isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
@@ -1185,7 +1186,7 @@ static SkImageInfo make_layer_info(const SkImageInfo& prev, int w, int h, bool i
         return SkImageInfo::MakeN32(w, h, alphaType);
     } else {
         // keep the same characteristics as the prev
-        return SkImageInfo::Make(w, h, prev.colorType(), alphaType, prev.profileType());
+        return SkImageInfo::Make(w, h, prev.colorType(), alphaType, sk_ref_sp(prev.colorSpace()));
     }
 }
 

diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index 948575482362410f65fc3eef09be8e7927921b7b..ee169239ef0867fe8c45662489d711800924bdd5 100644 (file)
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkImageInfo.h"
-#include "SkImageInfoPriv.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
@@ -61,14 +60,6 @@ SkColorProfileType SkImageInfo::profileType() const {
 }
 #endif
 
-// Indicate how images and gradients should interpret colors by default.
-bool gDefaultProfileIsSRGB;
-
-SkColorProfileType SkDefaultColorProfile() {
-    return gDefaultProfileIsSRGB ? kSRGB_SkColorProfileType
-                                 : kLinear_SkColorProfileType;
-}
-
 static bool alpha_type_is_valid(SkAlphaType alphaType) {
     return (alphaType >= 0) && (alphaType <= kLastEnum_SkAlphaType);
 }

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a9c60897285519662c6b8eb02dadba7def62ee72..970f75c7b8fcfd647aba9a13508137cc06e3ba7b 100644 (file)
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -244,7 +244,7 @@ void GrContext::flush(int flagsBitfield) {
 bool sw_convert_to_premul(GrPixelConfig srcConfig, int width, int height, size_t inRowBytes,
                           const void* inPixels, size_t outRowBytes, void* outPixels) {
     SkSrcPixelInfo srcPI;
-    if (!GrPixelConfig2ColorAndProfileType(srcConfig, &srcPI.fColorType, nullptr)) {
+    if (!GrPixelConfigToColorAndColorSpace(srcConfig, &srcPI.fColorType, nullptr)) {
         return false;
     }
     srcPI.fAlphaType = kUnpremul_SkAlphaType;
@@ -511,7 +511,7 @@ bool GrContext::readSurfacePixels(GrSurface* src,
     // Perform umpremul conversion if we weren't able to perform it as a draw.
     if (unpremul) {
         SkDstPixelInfo dstPI;
-        if (!GrPixelConfig2ColorAndProfileType(dstConfig, &dstPI.fColorType, nullptr)) {
+        if (!GrPixelConfigToColorAndColorSpace(dstConfig, &dstPI.fColorType, nullptr)) {
             return false;
         }
         dstPI.fAlphaType = kUnpremul_SkAlphaType;

diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 886945c71036052812e3e0e003ad931b1dfd672d..47fa394788645434ce133e5ac0df8e54c9682330 100644 (file)
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -118,12 +118,11 @@ bool GrSurface::readPixels(int left, int top, int width, int height,
 
 SkImageInfo GrSurface::info(SkAlphaType alphaType) const {
     SkColorType colorType;
-    SkColorProfileType profileType;
-    if (!GrPixelConfig2ColorAndProfileType(this->config(), &colorType, &profileType)) {
+    sk_sp<SkColorSpace> colorSpace;
+    if (!GrPixelConfigToColorAndColorSpace(this->config(), &colorType, &colorSpace)) {
         sk_throw();
     }
-    return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType,
-                             profileType);
+    return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType, colorSpace);
 }
 
 // TODO: This should probably be a non-member helper function. It might only be needed in

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 60fcdd513965a3a678b509036f0f1ea916af4de8..f937b16d55e166f0d1481186752e4507a2ed4816 100644 (file)
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -453,10 +453,10 @@ GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, const SkCol
     return kUnknown_GrPixelConfig;
 }
 
-bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut,
-                                       SkColorProfileType* ptOut) {
+bool GrPixelConfigToColorAndColorSpace(GrPixelConfig config, SkColorType* ctOut,
+                                       sk_sp<SkColorSpace>* csOut) {
     SkColorType ct;
-    SkColorProfileType pt = kLinear_SkColorProfileType;
+    sk_sp<SkColorSpace> cs = nullptr;
     switch (config) {
         case kAlpha_8_GrPixelConfig:
             ct = kAlpha_8_SkColorType;
@@ -478,11 +478,11 @@ bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut,
             break;
         case kSRGBA_8888_GrPixelConfig:
             ct = kRGBA_8888_SkColorType;
-            pt = kSRGB_SkColorProfileType;
+            cs = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
             break;
         case kSBGRA_8888_GrPixelConfig:
             ct = kBGRA_8888_SkColorType;
-            pt = kSRGB_SkColorProfileType;
+            cs = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
             break;
         case kRGBA_half_GrPixelConfig:
             ct = kRGBA_F16_SkColorType;
@@ -493,8 +493,8 @@ bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut,
     if (ctOut) {
         *ctOut = ct;
     }
-    if (ptOut) {
-        *ptOut = pt;
+    if (csOut) {
+        *csOut = cs;
     }
     return true;
 }
@@ -724,9 +724,9 @@ SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque) {
     SkASSERT(h <= desc.fHeight);
 #endif
     const GrPixelConfig config = tex->config();
-    SkColorType ct;
+    SkColorType ct = kUnknown_SkColorType;
     SkAlphaType at = isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
-    if (!GrPixelConfig2ColorAndProfileType(config, &ct, nullptr)) {
+    if (!GrPixelConfigToColorAndColorSpace(config, &ct, nullptr)) {
         ct = kUnknown_SkColorType;
     }
     return SkImageInfo::Make(w, h, ct, at);

diff --git a/src/gpu/SkGrPriv.h b/src/gpu/SkGrPriv.h
index 266cfff61cfe94605833b2d4b7a88336e8398674..ab77dc1e79a2004e7dd23bbf88f59ab92b7dab63 100644 (file)
--- a/src/gpu/SkGrPriv.h
+++ b/src/gpu/SkGrPriv.h
@@ -102,7 +102,7 @@ bool SkPaintToGrPaintWithTexture(GrContext* context,
 
 GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&, const GrCaps&);
 
-bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*);
+bool GrPixelConfigToColorAndColorSpace(GrPixelConfig, SkColorType*, sk_sp<SkColorSpace>*);
 
 /**
  *  If the compressed data in the SkData is supported (as a texture format, this returns

diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 3da5efebc5d590d835870a7abb5ecbdf08f80e39..1caffd54d6a5b58bca2cd481a6a618c0d57c6bf2 100644 (file)
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -13,8 +13,6 @@ DEFINE_bool(cpu, true, "master switch for running CPU-bound work.");
 DEFINE_bool(dryRun, false,
             "just print the tests that would be run, without actually running them.");
 
-DEFINE_bool(forceSRGB, false, "Force SRGB for imageinfos");
-
 DEFINE_bool(gpu, true, "master switch for running GPU-bound work.");
 
 DEFINE_string(images, "", "List of images and/or directories to decode. A directory with no images"

diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h
index b7eaca4eba210bfc384e022f6dd756e2ad950272..ddd0fc89e0c4d8f53c6976ef5e5ec79665c9cfb7 100644 (file)
--- a/tools/flags/SkCommonFlags.h
+++ b/tools/flags/SkCommonFlags.h
@@ -14,7 +14,6 @@
 
 DECLARE_bool(cpu);
 DECLARE_bool(dryRun);
-DECLARE_bool(forceSRGB);
 DECLARE_bool(gpu);
 DECLARE_string(images);
 DECLARE_string(colorImages);