diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-02 11:14:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-02 11:14:42 -0700 |
| commit | 6ebda80d6cee9dff24ad951261289ba2c85a8d95 (patch) | |
| tree | a23e87bb5dc51b29359b271eefa17b6ee382e450 /WebCore | |
| parent | f6ffd316a876667639ddcf06cf4ee871720eea6e (diff) | |
| parent | 2955a544aa75edb17e8d8c8e080a50812dfc535c (diff) | |
| download | external_webkit-6ebda80d6cee9dff24ad951261289ba2c85a8d95.zip external_webkit-6ebda80d6cee9dff24ad951261289ba2c85a8d95.tar.gz external_webkit-6ebda80d6cee9dff24ad951261289ba2c85a8d95.tar.bz2 | |
Merge "Update to Merge WebKit at r61871: Floating-point support for text selection."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/FontAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp index 5bcb8d5..6036d5a 100644 --- a/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/WebCore/platform/graphics/android/FontAndroid.cpp @@ -187,7 +187,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font, #ifndef SUPPORT_COMPLEX_SCRIPTS FloatRect Font::selectionRectForComplexText(const TextRun& run, - const IntPoint& point, int h, int, int) const + const FloatPoint& point, int h, int, int) const { SkPaint paint; SkScalar width, left; @@ -234,7 +234,7 @@ float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFon return SkScalarToFloat(width); } -int Font::offsetForPositionForComplexText(const TextRun& run, int x, +int Font::offsetForPositionForComplexText(const TextRun& run, float x, bool includePartialGlyphs) const { SkPaint paint; |