summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
diff options
context:
space:
mode:
authorclaireho <chinglanho@gmail.com>2011-10-12 18:37:58 -0700
committerclaireho <chinglanho@gmail.com>2011-10-17 10:15:59 -0700
commit295fd960c28a38cfa7a28d4b8f68f474394f7fb0 (patch)
tree0b67dc5791e552085f96df636b453745b9b0e48f /Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
parentc13fe17594dff1d9e702affd7cba2561d6fa3bef (diff)
downloadexternal_webkit-295fd960c28a38cfa7a28d4b8f68f474394f7fb0.zip
external_webkit-295fd960c28a38cfa7a28d4b8f68f474394f7fb0.tar.gz
external_webkit-295fd960c28a38cfa7a28d4b8f68f474394f7fb0.tar.bz2
Reapply CL for "Vertical Writing Mode" support.
Bug 5094208 - Browser does not handle Japanese text in vertical writing mode. This changeset syncs up with Chrome's implementation for vertical text rendering. It 1. Adds fontOrientation and textOrientation to FontPlatformData. 2. Rotates the text in drawGlyphs for vertical writing mode. Here are the changesets for Chrome's vertical writinig mode support: 1. http://trac.webkit.org/changeset/74232 2. http://trac.webkit.org/changeset/80610 3. http://trac.webkit.org/changeset/80654 This CL re-applies reverted CL136684(https://android-git.corp.google.com/g/#/c/136684/). CL136684 was rollbacked because 2 constructors in FontPlatformDataAndroid.cpp did not have the init for fontOrientation and textOrientation. That caused the inconsistent comparison while FontCache.cpp tries to get the cached font and falls into an infinite loop in HashTable.h:656 Change-Id: I45700dcc8c9266e1b5ae8e588205f24825ca4317
Diffstat (limited to 'Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
index 72fac68..693386e 100644
--- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
+++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.cpp
@@ -45,7 +45,8 @@ FontCustomPlatformData::~FontCustomPlatformData()
// the unref is enough to release the font data...
}
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic, FontOrientation, TextOrientation, FontWidthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic,
+ FontOrientation fontOrientation, TextOrientation textOrientation, FontWidthVariant, FontRenderingMode)
{
// turn bold/italic into fakeBold/fakeItalic
if (m_typeface != NULL) {
@@ -54,7 +55,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b
if (m_typeface->isItalic() == italic)
italic = false;
}
- return FontPlatformData(m_typeface, size, bold, italic);
+ return FontPlatformData(m_typeface, size, bold, italic, fontOrientation, textOrientation);
}
FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)