diff options
| author | claireho <chinglanho@gmail.com> | 2012-03-30 14:55:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-30 14:55:35 -0700 |
| commit | 8c5a835fb0ffdb3042373684bfab54fed5c7d211 (patch) | |
| tree | 62d6c6860a4f317825750543748db87df90fb120 /Source/WebCore/platform/graphics | |
| parent | 361796a8de13ad8057f57e08c2322e3a025ae63b (diff) | |
| parent | 050a1e6d90f809761b30a3c926ec89bd44eba55d (diff) | |
| download | external_webkit-8c5a835fb0ffdb3042373684bfab54fed5c7d211.zip external_webkit-8c5a835fb0ffdb3042373684bfab54fed5c7d211.tar.gz external_webkit-8c5a835fb0ffdb3042373684bfab54fed5c7d211.tar.bz2 | |
Merge "Line spacing for vertical writing mode."
Diffstat (limited to 'Source/WebCore/platform/graphics')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontDataAndroid.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontDataAndroid.cpp b/Source/WebCore/platform/graphics/android/FontDataAndroid.cpp index c6dd174..88822df 100644 --- a/Source/WebCore/platform/graphics/android/FontDataAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontDataAndroid.cpp @@ -56,8 +56,12 @@ void SimpleFontData::platformInit() m_fontMetrics.setAscent(a); m_fontMetrics.setDescent(d); m_fontMetrics.setXHeight(SkScalarToFloat(-skiaFontMetrics.fAscent) * 0.56f); // hack I stole from the window's port - m_fontMetrics.setLineSpacing(a + d); - m_fontMetrics.setLineGap(SkScalarToFloat(skiaFontMetrics.fLeading)); + float lineGap = SkScalarToFloat(skiaFontMetrics.fLeading); + if (platformData().orientation() == Vertical && lineGap == 0) { + lineGap = skiaFontMetrics.fAvgCharWidth * 0.56f; + } + m_fontMetrics.setLineGap(lineGap); + m_fontMetrics.setLineSpacing(a + d + lineGap); if (platformData().orientation() == Vertical && !isTextOrientationFallback()) { static const uint32_t vheaTag = SkSetFourByteTag('v', 'h', 'e', 'a'); |