diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-24 13:16:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-24 13:16:24 -0700 |
| commit | 20dac8856594aa633c8c7562304c865864f666ff (patch) | |
| tree | 9b60e013198eca0ef0b9550311b6165ad80a7e6a | |
| parent | d18b861061253c8691949379546a7f96c9e251c9 (diff) | |
mixed text blobs really draws LCD
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1261483002
| -rw-r--r-- | gm/mixedtextblobs.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp index 32ebdec924..a98f531f21 100644 --- a/gm/mixedtextblobs.cpp +++ b/gm/mixedtextblobs.cpp @@ -69,6 +69,7 @@ protected: // LCD paint.setTextSize(32); text = "LCD!!!!!"; + paint.setAntiAlias(true); paint.setSubpixelText(true); paint.setLCDRenderText(true); paint.measureText(text, strlen(text), &bounds); @@ -78,6 +79,7 @@ protected: // color emoji if (fEmojiTypeface) { + paint.setAntiAlias(false); paint.setSubpixelText(false); paint.setLCDRenderText(false); paint.setTypeface(fEmojiTypeface); diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index eae8ec70e5..f64ab1d844 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -1243,7 +1243,7 @@ static void add_flattenable(SkDescriptor* desc, uint32_t tag, buffer->writeToMemory(desc->addEntry(tag, buffer->bytesWritten(), NULL)); } -static SkMask::Format computeMaskFormat(const SkPaint& paint) { +static SkMask::Format compute_mask_format(const SkPaint& paint) { uint32_t flags = paint.getFlags(); // Antialiasing being disabled trumps all other settings. @@ -1405,7 +1405,7 @@ void SkScalerContext::MakeRec(const SkPaint& paint, rec->fStrokeJoin = 0; } - rec->fMaskFormat = SkToU8(computeMaskFormat(paint)); + rec->fMaskFormat = SkToU8(compute_mask_format(paint)); if (SkMask::kLCD16_Format == rec->fMaskFormat) { if (too_big_for_lcd(*rec, checkPost2x2)) { |