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/gm/SkLinearBitmapPipelineGM.cpp b/gm/SkLinearBitmapPipelineGM.cpp
index 777f825..c78bc74 100644
--- a/gm/SkLinearBitmapPipelineGM.cpp
+++ b/gm/SkLinearBitmapPipelineGM.cpp
@@ -55,7 +55,7 @@
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 @@
}
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 7ea1746..b657f4f 100644
--- a/gm/all_bitmap_configs.cpp
+++ b/gm/all_bitmap_configs.cpp
@@ -246,13 +246,13 @@
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 @@
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 33d8377..5a516a5 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -73,10 +73,13 @@
// 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 05aef4c..42d650e 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -48,8 +48,9 @@
// 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 c9fa28b..eb4c760 100644
--- a/gm/gamma.cpp
+++ b/gm/gamma.cpp
@@ -18,6 +18,7 @@
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 @@
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 15d362e..bae77c5 100644
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -78,7 +78,7 @@
// 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 87c432f..a241c5c 100644
--- a/gm/textblobgeometrychange.cpp
+++ b/gm/textblobgeometrychange.cpp
@@ -42,7 +42,8 @@
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 8f5dc85..8fdf558 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -102,8 +102,10 @@
#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 2a6fc8e..58f0dc6 100644
--- a/gm/textblobrandomfont.cpp
+++ b/gm/textblobrandomfont.cpp
@@ -97,8 +97,8 @@
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 2b554b6..642175e 100644
--- a/gm/xfermodes3.cpp
+++ b/gm/xfermodes3.cpp
@@ -126,7 +126,7 @@
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);