| Index: src/gpu/SkGpuDevice.cpp
|
| diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
|
| index 06f6eb7778fd8dd925af8fc5683ab924ed4b0f92..ba3433fd0eb921a3e6cf5acb85a2197a8fe0aefd 100644
|
| --- a/src/gpu/SkGpuDevice.cpp
|
| +++ b/src/gpu/SkGpuDevice.cpp
|
| @@ -1722,26 +1722,18 @@ void SkGpuDevice::drawTextOnPath(const SkDraw& draw, const void* text,
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -bool SkGpuDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
|
| - if (!paint.isLCDRenderText()) {
|
| - // we're cool with the paint as is
|
| - return false;
|
| - }
|
| -
|
| +bool SkGpuDevice::onDisableLCD(const SkPaint& paint) const {
|
| if (paint.getShader() ||
|
| - paint.getXfermode() || // unless its srcover
|
| + !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode) ||
|
| paint.getMaskFilter() ||
|
| paint.getRasterizer() ||
|
| paint.getColorFilter() ||
|
| paint.getPathEffect() ||
|
| paint.isFakeBoldText() ||
|
| - paint.getStyle() != SkPaint::kFill_Style) {
|
| - // turn off lcd, but turn on kGenA8
|
| - flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
|
| - flags->fFlags |= SkPaint::kGenA8FromLCD_Flag;
|
| + paint.getStyle() != SkPaint::kFill_Style)
|
| + {
|
| return true;
|
| }
|
| - // we're cool with the paint as is
|
| return false;
|
| }
|
|
|
|
|