Replace isGammaCorrect with isLinearlyBlended

We were using isGammaCorrect (presence of a color space) to trigger
rendering effects that should only apply when doing linear blending.
Rename and redefine that function to fix many of those issues.

In a few places, we really do care about the color space.

The big win here is text rendering, which is now the same on legacy
gl and glsrgb configs. Also left some comments about our desire to
do something smarter for text in the future.

Bug: skia:
Change-Id: I94106e95f5f81aaa0a28dbaccd65f5d94cf0de67
Reviewed-on: https://skia-review.googlesource.com/139109
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index a20ba4424a..16f164c9c8 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -75,9 +75,10 @@ SkColor GrTextContext::ComputeCanonicalColor(const SkPaint& paint, bool lcd) {
 
 SkScalerContextFlags GrTextContext::ComputeScalerContextFlags(
         const GrColorSpaceInfo& colorSpaceInfo) {
-    // If we're doing gamma-correct rendering, then we can disable the gamma hacks.
+    // If we're doing linear blending, then we can disable the gamma hacks.
     // Otherwise, leave them on. In either case, we still want the contrast boost:
-    if (colorSpaceInfo.isGammaCorrect()) {
+    // TODO: Can we be even smarter about mask gamma based on the dest transfer function?
+    if (colorSpaceInfo.isLinearlyBlended()) {
         return SkScalerContextFlags::kBoostContrast;
     } else {
         return SkScalerContextFlags::kFakeGammaAndBoostContrast;