aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-09-30 20:53:23 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-09-30 20:53:23 +0000
commit600b3f658ce41f064bddd25ef06be0d6f208512a (patch)
tree27575b6d9ff7620679fc8f3efd31d9c31337fa7e
parent97d1a2239887f0c08ffcdb09d76d6df3673cf6d9 (diff)
don't autoset forceaa (yet), but require the caller to do that. In the future
we may add an explicit flag on Bitmap/Device which will say "disable LCD for me" in which case we would want to set the forceaa flag (meaning the caller wanted LCD, but we couldn't do it) git-svn-id: http://skia.googlecode.com/svn/trunk@2390 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/core/SkDevice.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 2242251434..18087ae04d 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -225,7 +225,6 @@ bool SkDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
}
if (SkBitmap::kARGB_8888_Config != fBitmap.config() ||
-// !fBitmap.isOpaque() ||
paint.getShader() ||
paint.getXfermode() || // unless its srcover
paint.getMaskFilter() ||
@@ -236,10 +235,6 @@ bool SkDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
paint.getStyle() != SkPaint::kFill_Style) {
// turn off lcd
flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
-#ifdef SK_BUILD_FOR_WIN
- // flag that we *really* want AA
- flags->fFlags |= SkPaint::kForceAAText_Flag;
-#endif
flags->fHinting = paint.getHinting();
return true;
}