aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/text/GrTextUtils.cpp
diff options
context:
space:
mode:
authorGravatar Jim Van Verth <jvanverth@google.com>2017-06-08 11:14:35 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-08 15:49:20 +0000
commitbc2cdd154bf5a031ca9d3a530123d9f7a4c0925d (patch)
treef346ec9baf75db146109e35330f89dd15086471c /src/gpu/text/GrTextUtils.cpp
parente03a72917e5ce7ab8f19260c627e00a7fe0ceefd (diff)
Fix LCD distance field text color filtering
Distance field text was applying the color filter to determine any gamma adjustments, but not any effects of the shader as well. Bug: skia:6669 Change-Id: I73384f68141fb523ea2058e00d0a9fbb2fbc622b Reviewed-on: https://skia-review.googlesource.com/19049 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/text/GrTextUtils.cpp')
-rw-r--r--src/gpu/text/GrTextUtils.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/text/GrTextUtils.cpp b/src/gpu/text/GrTextUtils.cpp
index 9baf3412dc..20001a4f8a 100644
--- a/src/gpu/text/GrTextUtils.cpp
+++ b/src/gpu/text/GrTextUtils.cpp
@@ -60,14 +60,12 @@ void GrTextUtils::Paint::initFilteredColor() {
fPaint->getColorFilter()->filterColor4f(filteredColor.toSkColor4f()));
}
fFilteredPremulColor = filteredColor.premul().toGrColor();
- fFilteredUnpremulColor = filteredColor.toGrColor();
} else {
SkColor filteredSkColor = fPaint->getColor();
if (fPaint->getColorFilter()) {
filteredSkColor = fPaint->getColorFilter()->filterColor(filteredSkColor);
}
fFilteredPremulColor = SkColorToPremulGrColor(filteredSkColor);
- fFilteredUnpremulColor = SkColorToUnpremulGrColor(filteredSkColor);
}
}