diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-30 20:50:54 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:57 +0100 |
| commit | ccb5a79614e295dfefe24149ecc73f46e8bff0e7 (patch) | |
| tree | adecc83ca31329e452f65080cb3ed5ee212a9a99 | |
| parent | 6649bd3b5974da46ef95db9ede01cb11ddcd3790 (diff) | |
| download | external_webkit-ccb5a79614e295dfefe24149ecc73f46e8bff0e7.zip external_webkit-ccb5a79614e295dfefe24149ecc73f46e8bff0e7.tar.gz external_webkit-ccb5a79614e295dfefe24149ecc73f46e8bff0e7.tar.bz2 | |
Merge WebKit at r61871: Floating-point support for text selection.
http://trac.webkit.org/changeset/61253
Change-Id: If90b8c599f64c659436278c217d678a981db262f
| -rw-r--r-- | WebCore/platform/graphics/android/FontAndroid.cpp | 4 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp index 725793b..2f07bdf 100644 --- a/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/WebCore/platform/graphics/android/FontAndroid.cpp @@ -625,7 +625,7 @@ private: FloatRect Font::selectionRectForComplexText(const TextRun& run, - const IntPoint& point, int height, int from, int to) const + const FloatPoint& point, int height, int from, int to) const { int fromX = -1, toX = -1, fromAdvance = -1, toAdvance = -1; @@ -755,7 +755,7 @@ static int glyphIndexForXPositionInScriptRun(const TextRunWalker& walker, int x) return glyphIndex; } -int Font::offsetForPositionForComplexText(const TextRun& run, int x, +int Font::offsetForPositionForComplexText(const TextRun& run, float x, bool includePartialGlyphs) const { // (Mac code ignores includePartialGlyphs, and they don't know what it's diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 6907f4b..408f4e7 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -869,7 +869,7 @@ void GraphicsContext::endTransparencyLayer() m_data->setFillColor(c); } -void GraphicsContext::setPlatformShadow(const IntSize& size, float blur, const Color& color, ColorSpace) +void GraphicsContext::setPlatformShadow(const FloatSize& size, float blur, const Color& color, ColorSpace) { if (paintingDisabled()) return; |