diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-10-12 14:34:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 14:34:30 -0700 |
| commit | c13fe17594dff1d9e702affd7cba2561d6fa3bef (patch) | |
| tree | fb0bfbc658d0cb66c55d48806bab4a473316248b /Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp | |
| parent | 25b6485c2f117e2ed3dc3abfe2467f699dfe1942 (diff) | |
| parent | 64652022e8f43ecfabaebc5cd148f1c3058e667c (diff) | |
| download | external_webkit-c13fe17594dff1d9e702affd7cba2561d6fa3bef.zip external_webkit-c13fe17594dff1d9e702affd7cba2561d6fa3bef.tar.gz external_webkit-c13fe17594dff1d9e702affd7cba2561d6fa3bef.tar.bz2 | |
Merge "Revert "Support "Vertical Writing Mode".""
Diffstat (limited to 'Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp index 4279ce8..72fac68 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp @@ -45,8 +45,7 @@ FontCustomPlatformData::~FontCustomPlatformData() // the unref is enough to release the font data... } -FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, - FontOrientation fontOrientation, TextOrientation textOrientation, FontWidthVariant, FontRenderingMode) +FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode) { // turn bold/italic into fakeBold/fakeItalic if (m_typeface != NULL) { @@ -55,7 +54,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b if (m_typeface->isItalic() == italic) italic = false; } - return FontPlatformData(m_typeface, size, bold, italic, fontOrientation, textOrientation); + return FontPlatformData(m_typeface, size, bold, italic); } FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer) |