Roll external/skia 08b79b73a..ddfd2a662 (2 commits)
https://skia.googlesource.com/skia.git/+log/08b79b73a..ddfd2a662
2017-08-14 robertphillips@google.com Use kLow_SkFilterQuality in generateGlyphImage
2017-08-14 mtklein@chromium.org we never define BLEND_MODE
Test: Presubmit checks will test this change.
Change-Id: Id81ffcc70f9ddbeeae60c7ff41a5dde26dc56d10
diff --git a/src/jumper/SkJumper_stages_8bit.cpp b/src/jumper/SkJumper_stages_8bit.cpp
index 3d9fec0..d1b0f54 100644
--- a/src/jumper/SkJumper_stages_8bit.cpp
+++ b/src/jumper/SkJumper_stages_8bit.cpp
@@ -440,5 +440,3 @@
V min_ = min(src*alpha(dst), dst*alpha(src));
src = (src - min_) + (dst - zero_alpha(min_));
}
-
-#undef BLEND_MODE
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index a216fdb..864f75d 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -585,7 +585,15 @@
canvas.translate(face->glyph->bitmap_left, -face->glyph->bitmap_top);
SkPaint paint;
- paint.setFilterQuality(kMedium_SkFilterQuality);
+ // Using kMedium FilterQuality will cause mipmaps to be generated. Use
+ // kLow when the results will be roughly the same in order to avoid
+ // the mipmap generation cost.
+ // See skbug.com/6967
+ if (bitmapTransform.getMinScale() < 0.5) {
+ paint.setFilterQuality(kMedium_SkFilterQuality);
+ } else {
+ paint.setFilterQuality(kLow_SkFilterQuality);
+ }
canvas.drawBitmap(unscaledBitmap, 0, 0, &paint);
// If the destination is BW or LCD, convert from A8.