diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 11:36:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:32 +0100 |
| commit | c44f6b3b1e33ac1efbae8dc6e73fed0d329bafd4 (patch) | |
| tree | 5cfdfcdffd55b38cecff572c74a9f89a9a02c795 /WebCore/platform/graphics/android/FontDataAndroid.cpp | |
| parent | b2a9e2728d6dcf8aecf09fe037e942a8dba233c1 (diff) | |
| download | external_webkit-c44f6b3b1e33ac1efbae8dc6e73fed0d329bafd4.zip external_webkit-c44f6b3b1e33ac1efbae8dc6e73fed0d329bafd4.tar.gz external_webkit-c44f6b3b1e33ac1efbae8dc6e73fed0d329bafd4.tar.bz2 | |
Merge WebKit at r74534: Fix FontDataAndroid.cpp
Add new functions introduced upstream for CSS
text-emphasis property.
See http://trac.webkit.org/changeset/74169
Change-Id: I5fff00db5b30979e29c9af75650e5df8d9eaff64
Diffstat (limited to 'WebCore/platform/graphics/android/FontDataAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/FontDataAndroid.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/FontDataAndroid.cpp b/WebCore/platform/graphics/android/FontDataAndroid.cpp index 13e9500..545dcf7 100644 --- a/WebCore/platform/graphics/android/FontDataAndroid.cpp +++ b/WebCore/platform/graphics/android/FontDataAndroid.cpp @@ -74,10 +74,22 @@ void SimpleFontData::platformDestroy() SimpleFontData* SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const { - if (!m_smallCapsFontData) { - m_smallCapsFontData = new SimpleFontData(FontPlatformData(m_platformData, fontDescription.computedSize() * 0.7f)); - } - return m_smallCapsFontData; + if (!m_derivedFontData) + m_derivedFontData = DerivedFontData::create(isCustomFont()); + if (!m_derivedFontData->smallCaps) + m_derivedFontData->smallCaps = new SimpleFontData(FontPlatformData(m_platformData, fontDescription.computedSize() * 0.7f)); + + return m_derivedFontData->smallCaps.get(); +} + +SimpleFontData* SimpleFontData::emphasisMarkFontData(const FontDescription& fontDescription) const +{ + if (!m_derivedFontData) + m_derivedFontData = DerivedFontData::create(isCustomFont()); + if (!m_derivedFontData->emphasisMark) + m_derivedFontData->emphasisMark = new SimpleFontData(FontPlatformData(m_platformData, fontDescription.computedSize() * 0.5f)); + + return m_derivedFontData->emphasisMark.get(); } bool SimpleFontData::containsCharacters(const UChar* characters, int length) const |