diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-12-01 05:05:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 05:05:00 -0800 |
| commit | f2dadfc1448dce014a7813b0d101e6c744ad6542 (patch) | |
| tree | 7655ec7ca1af37f52ebfafaf8e12b87e82300306 /Source | |
| parent | 87f8fc15a0e59f6d88c57f390697ba1c5bbaa6c3 (diff) | |
| parent | 1c8a30e3171074faf014d543d71d004cde419d53 (diff) | |
| download | external_webkit-f2dadfc1448dce014a7813b0d101e6c744ad6542.zip external_webkit-f2dadfc1448dce014a7813b0d101e6c744ad6542.tar.gz external_webkit-f2dadfc1448dce014a7813b0d101e6c744ad6542.tar.bz2 | |
Merge "Ensure font encoding is correct for drawing loopers." into ics-mr1
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontAndroid.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp index 81dbdae..0a8c0c1 100644 --- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp @@ -98,6 +98,10 @@ static bool setupForText(SkPaint* paint, GraphicsContext* gc, SkLayerDrawLooper* looper = new SkLayerDrawLooper; paint->setLooper(looper)->unref(); + // The layerDrawLooper uses at the root paint to determine the text + // encoding so we need to make sure it is properly configured. + updateForFont(paint, font); + // Specify the behavior of the looper SkLayerDrawLooper::LayerInfo info; info.fPaintBits = SkLayerDrawLooper::kEntirePaint_Bits; |