summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-17 15:03:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-17 15:03:04 -0700
commit597b6ea5ce33c643654043c82d0bb087586fb27a (patch)
treec2f38e5329d4a07c615226f3fe646b5df388dac9 /WebCore
parent330e608aa0a04d09cbb92a754420c115fb16d993 (diff)
parentb7c854aed9c3a06b7d7fd977ce6fdba58c41126e (diff)
downloadexternal_webkit-597b6ea5ce33c643654043c82d0bb087586fb27a.zip
external_webkit-597b6ea5ce33c643654043c82d0bb087586fb27a.tar.gz
external_webkit-597b6ea5ce33c643654043c82d0bb087586fb27a.tar.bz2
am b7c854ae: am 18e97e57: merge from open-source master
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 0a67188..53d874a 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)));
}