From 5f544345d653900ef30212ea1c243947be8bb074 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 22 Sep 2016 12:32:07 -0700 Subject: [PATCH] Remove assert that current color is never used. The COLR table format allows for use of the 'current color'. Currently the code asserts if this is used, but will use a nearby luminance grey to this color instead if the assert is ignored. Remove the assert now that this path is known to be used. BUG=skia:5788 Review-Url: https://codereview.chromium.org/2359923004 --- src/ports/SkScalerContext_win_dw.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index c9ff5d86c3..0c588e8d3c 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/src/ports/SkScalerContext_win_dw.cpp @@ -808,9 +808,7 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) { // the 'current brush' is used. fRec.getLuminanceColor() is kinda sorta what is wanted // here, but not really, it will often be the wrong value because it wan't designed for // this. - // In practice, I've not encountered a color glyph that uses the current brush color. - // If this assert ever fires, we should verify that the color is rendered properly. - SkASSERT(false); + // TODO: implement this fully, bug.skia.org/5788 color = fRec.getLuminanceColor(); } paint.setColor(color);