summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly Hewlett <billyh@google.com>2012-05-21 14:43:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-21 14:43:40 -0700
commit8a1bb3c8b059f4e7bc3b677e57fee17548de650e (patch)
treed68b4a8d886734047ea69ef195a0fe926041e20e
parent655f75feeee4c396740a8e768888c7c8f0602cb8 (diff)
parent8084d1f1dd41063c37a77b12f382ee2b08ded30b (diff)
downloadexternal_webkit-8a1bb3c8b059f4e7bc3b677e57fee17548de650e.zip
external_webkit-8a1bb3c8b059f4e7bc3b677e57fee17548de650e.tar.gz
external_webkit-8a1bb3c8b059f4e7bc3b677e57fee17548de650e.tar.bz2
am 8084d1f1: Merge "Turn off autohinting at HDPI. do not merge" into jb-dev
* commit '8084d1f1dd41063c37a77b12f382ee2b08ded30b': Turn off autohinting at HDPI. do not merge
-rw-r--r--Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp
index 0bd443b..e26fa9e 100644
--- a/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp
@@ -96,6 +96,10 @@ static bool setupForText(SkPaint* paint, GraphicsContext* gc,
float shadowBlur;
Color shadowColor;
ColorSpace shadowColorSpace;
+
+ if (RenderSkinAndroid::DrawableResolution() >= RenderSkinAndroid::HighRes)
+ paint->setAutohinted(false);
+
bool hasShadow = gc->getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
bool hasBothStrokeAndFill =
(mode & (TextModeStroke | TextModeFill)) == (TextModeStroke | TextModeFill);