summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-17 10:23:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-17 10:23:33 -0700
commit18e97e57694ae8596ac316af30cb5512fe8ef1bf (patch)
treea08a8be464bb226e712b19fcc79e77eb5e8b9088 /WebCore
parent75238a0c6749b428ac76d812d1ab08bedaec5ee3 (diff)
parent09dca88f0da7c89ba4ae519c1c4f123cb0c279ff (diff)
downloadexternal_webkit-18e97e57694ae8596ac316af30cb5512fe8ef1bf.zip
external_webkit-18e97e57694ae8596ac316af30cb5512fe8ef1bf.tar.gz
external_webkit-18e97e57694ae8596ac316af30cb5512fe8ef1bf.tar.bz2
merge from open-source master
Change-Id: I0b566897309348d094f93ed7ae5d9af7b0e8a377
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/FontAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp
index 36c6248..c783a0b 100644
--- a/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -188,7 +188,7 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run,
SkScalar spacing = paint.getFontMetrics(&metrics);
return FloatRect(point.x(),
- point.y() - floorf(SkScalarToFloat(-metrics.fAscent)),
+ point.y(),
roundf(SkScalarToFloat(width)),
roundf(SkScalarToFloat(spacing)));
}