commit 8bd22ae8dea6f55eba07e37f2908139158262d1b
author Herb Derby <herb@google.com> Tue Apr 16 11:35:31 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 16 17:45:44 2019 +0000
tree 7724911d1e3251bd3cd79b52efc28a070862a456
parent 68aeec07de4a1894a5cefde405abcb5a49801df6

Remove non-canonical font color

Change-Id: I65563e0a1814d0e59734a5fac794b906aa939f04
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208511
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/core/SkScalerContext.cpp

diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index 519744d..b197dae 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -811,18 +811,10 @@
     return kNone_SkAxisAlignment;
 }
 
-#ifdef SK_ENABLE_LEGACY_TEXT_COLOR
-void SkScalerContextRec::setLuminanceColor(SkColor c) {
-    fLumBits = SkColorSetRGB(SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
-}
-#else
 void SkScalerContextRec::setLuminanceColor(SkColor c) {
     fLumBits = SkMaskGamma::CanonicalColor(
             SkColorSetRGB(SkColorGetR(c), SkColorGetG(c), SkColorGetB(c)));
 }
-#endif
-
-
 
 ///////////////////////////////////////////////////////////////////////////////