summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/FontAndroid.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-19 17:38:10 +0100
committerSteve Block <steveblock@google.com>2011-05-25 15:27:55 +0100
commit4ca4fadf20df64973fab6d833db6d5dff4ef7e8f (patch)
tree82c41cd297c2c3398bfbe6b43bb38ba4a6cca65c /Source/WebCore/platform/graphics/android/FontAndroid.cpp
parent89ff5bedced41f7901101fa36064aa99b78aa3f4 (diff)
downloadexternal_webkit-4ca4fadf20df64973fab6d833db6d5dff4ef7e8f.zip
external_webkit-4ca4fadf20df64973fab6d833db6d5dff4ef7e8f.tar.gz
external_webkit-4ca4fadf20df64973fab6d833db6d5dff4ef7e8f.tar.bz2
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
See http://trac.webkit.org/changeset/76743 Change-Id: Ic85c640534b133883a03e0c0b71ac8987e6913e7
Diffstat (limited to 'Source/WebCore/platform/graphics/android/FontAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/FontAndroid.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
index e4e96f9..af2edc7 100644
--- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -161,6 +161,11 @@ bool Font::canReturnFallbackFontsForComplexText()
return false;
}
+bool Font::canExpandAroundIdeographsInComplexText()
+{
+ return false;
+}
+
void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
const GlyphBuffer& glyphBuffer, int from, int numGlyphs,
const FloatPoint& point) const