aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPaint.cpp
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2014-07-01 13:42:59 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-01 13:43:00 -0700
commitdc1cf66483e93c2d12d938bc1ce3b8c60cc68da5 (patch)
treeeb07dbc68f3805821b0aa2b56a0a5ddb0522f327 /src/core/SkPaint.cpp
parente41f3886ead65550cdbfa99b8f4b7c1831ec3221 (diff)
Remove A8_LCD luminance hack.
It no longer appears to be necessary, and the powf function is slowing down Android text rendering. R=bungeman@google.com, bsalomon@google.com Author: jvanverth@google.com Review URL: https://codereview.chromium.org/337603008
Diffstat (limited to 'src/core/SkPaint.cpp')
-rw-r--r--src/core/SkPaint.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 86b54f22c8..2e1c70b864 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -1778,15 +1778,19 @@ void SkScalerContext::PostMakeRec(const SkPaint&, SkScalerContext::Rec* rec) {
case SkMask::kA8_Format: {
// filter down the luminance to a single component, since A8 can't
// use per-component information
-
SkColor color = rec->getLuminanceColor();
+#ifdef SK_IGNORE_FASTER_TEXT_FIX
U8CPU lum = SkColorSpaceLuminance::computeLuminance(rec->getPaintGamma(), color);
//If we are asked to look like LCD, look like LCD.
if (!(rec->fFlags & SkScalerContext::kGenA8FromLCD_Flag)) {
// HACK: Prevents green from being pre-blended as white.
lum -= ((255 - lum) * lum) / 255;
}
-
+#else
+ U8CPU lum = SkComputeLuminance(SkColorGetR(color),
+ SkColorGetG(color),
+ SkColorGetB(color));
+#endif
// reduce to our finite number of bits
color = SkColorSetRGB(lum, lum, lum);
rec->setLuminanceColor(SkMaskGamma::CanonicalColor(color));