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
This commit is contained in:
bungeman 2016-09-22 12:32:07 -07:00 committed by Commit bot
parent d454609f62
commit 5f544345d6

View File

@ -808,9 +808,7 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
// the 'current brush' is used. fRec.getLuminanceColor() is kinda sorta what is wanted // 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 // here, but not really, it will often be the wrong value because it wan't designed for
// this. // this.
// In practice, I've not encountered a color glyph that uses the current brush color. // TODO: implement this fully, bug.skia.org/5788
// If this assert ever fires, we should verify that the color is rendered properly.
SkASSERT(false);
color = fRec.getLuminanceColor(); color = fRec.getLuminanceColor();
} }
paint.setColor(color); paint.setColor(color);