Remove SkSurfaceProps gamma-correctness flag entirely.
This is no longer required - gamma-correctness is now just based on the
presence or absence of a color space.
Public API change is just removal of (unused) flag.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2188463002
TBR=bsalomon@google.com
Review-Url: https://codereview.chromium.org/2188463002
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index 8ab2df7..f1b9728 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -43,10 +43,7 @@
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;
- SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag | gammaCorrect,
+ SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag,
SkSurfaceProps::kLegacyFontHost_InitType);
auto surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props));
SkCanvas* canvas = surface ? surface->getCanvas() : inputCanvas;
diff --git a/gm/surface.cpp b/gm/surface.cpp
index bae77c5..6846f72 100644
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -22,7 +22,7 @@
}
static sk_sp<SkSurface> make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelGeometry geo,
- int disallowAA, int disallowDither, bool gammaCorrect) {
+ int disallowAA, int disallowDither) {
uint32_t flags = 0;
if (disallowAA) {
flags |= SkSurfaceProps::kDisallowAntiAlias_Flag;
@@ -30,9 +30,6 @@
if (disallowDither) {
flags |= SkSurfaceProps::kDisallowDither_Flag;
}
- if (gammaCorrect) {
- flags |= SkSurfaceProps::kGammaCorrect_Flag;
- }
SkSurfaceProps props(flags, geo);
if (ctx) {
@@ -79,8 +76,6 @@
// must be opaque to have a hope of testing LCD text
const SkImageInfo info = SkImageInfo::MakeN32(W, H, kOpaque_SkAlphaType,
sk_ref_sp(canvas->imageInfo().colorSpace()));
- SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
- bool gammaCorrect = canvas->getProps(&canvasProps) && canvasProps.isGammaCorrect();
const struct {
SkPixelGeometry fGeo;
@@ -98,8 +93,7 @@
for (int disallowDither = 0; disallowDither <= 1; ++disallowDither) {
SkScalar y = 0;
for (const auto& rec : recs) {
- auto surface(make_surface(ctx, info, rec.fGeo, disallowAA, disallowDither,
- gammaCorrect));
+ auto surface(make_surface(ctx, info, rec.fGeo, disallowAA, disallowDither));
if (!surface) {
SkDebugf("failed to create surface! label: %s AA: %s dither: %s\n",
rec.fLabel, (disallowAA == 1 ? "disallowed" : "allowed"),
diff --git a/gm/textblobgeometrychange.cpp b/gm/textblobgeometrychange.cpp
index a241c5c..1b7bff3 100644
--- a/gm/textblobgeometrychange.cpp
+++ b/gm/textblobgeometrychange.cpp
@@ -44,10 +44,7 @@
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;
- SkSurfaceProps props(gammaCorrect, kUnknown_SkPixelGeometry);
+ SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
auto surface = canvas->makeSurface(info, &props);
if (!surface) {
surface = SkSurface::MakeRaster(info, &props);
diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index 8fdf558..4e3f0ea 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -106,10 +106,7 @@
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;
- SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag | gammaCorrect,
+ SkSurfaceProps props(SkSurfaceProps::kUseDeviceIndependentFonts_Flag,
SkSurfaceProps::kLegacyFontHost_InitType);
surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
canvas = surface.get() ? surface->getCanvas() : inputCanvas;
diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp
index 58f0dc6..2e8249f 100644
--- a/gm/textblobrandomfont.cpp
+++ b/gm/textblobrandomfont.cpp
@@ -99,10 +99,7 @@
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;
- SkSurfaceProps props(gammaCorrect, kUnknown_SkPixelGeometry);
+ SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
auto surface(canvas->makeSurface(info, &props));
if (surface) {
SkPaint paint;