Fix some fixed-width CJK

http://code.google.com/p/skia/issues/detail?id=222

git-svn-id: http://skia.googlecode.com/svn/trunk@1261 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 280e0a10a51d3b4807cd03b60ef60b76a45cc1d2..5ed66c883a2071b6699a0332a1324ada4122ac0c 100644 (file)
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -663,6 +663,11 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(const SkDescriptor* desc)
         if ((fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag) == 0)
             loadFlags |= FT_LOAD_NO_BITMAP;
 
+        // Always using FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH to get correct
+        // advances, as fontconfig and cairo do.
+        // See http://code.google.com/p/skia/issues/detail?id=222.
+        loadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
+
         fLoadGlyphFlags = loadFlags;
     }