diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-17 13:53:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-17 13:53:30 -0700 |
| commit | b7c854aed9c3a06b7d7fd977ce6fdba58c41126e (patch) | |
| tree | 7eca5d8d69c5b353947f30196591dd35ad72b0ad | |
| parent | c1cdea2349a33a0ef36e5a10fe8298aa9ee05294 (diff) | |
| parent | 18e97e57694ae8596ac316af30cb5512fe8ef1bf (diff) | |
| download | external_webkit-b7c854aed9c3a06b7d7fd977ce6fdba58c41126e.zip external_webkit-b7c854aed9c3a06b7d7fd977ce6fdba58c41126e.tar.gz external_webkit-b7c854aed9c3a06b7d7fd977ce6fdba58c41126e.tar.bz2 | |
am 18e97e57: merge from open-source master
Merge commit '18e97e57694ae8596ac316af30cb5512fe8ef1bf' into kraken
* commit '18e97e57694ae8596ac316af30cb5512fe8ef1bf':
Fix focus ring on links with non-latin text
| -rw-r--r-- | WebCore/platform/graphics/android/FontAndroid.cpp | 2 |
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))); } |