diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/platform/graphics/wx/FontWx.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/platform/graphics/wx/FontWx.cpp')
| -rw-r--r-- | WebCore/platform/graphics/wx/FontWx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/wx/FontWx.cpp b/WebCore/platform/graphics/wx/FontWx.cpp index 3dcabf1..cc45ab0 100644 --- a/WebCore/platform/graphics/wx/FontWx.cpp +++ b/WebCore/platform/graphics/wx/FontWx.cpp @@ -70,7 +70,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, const SimpleFontData* fo drawTextWithSpacing(graphicsContext, font, color, glyphBuffer, from, numGlyphs, point); } -FloatRect Font::selectionRectForComplexText(const TextRun& run, const IntPoint& point, int h, int from, int to) const +FloatRect Font::selectionRectForComplexText(const TextRun& run, const FloatPoint& point, int h, int from, int to) const { #if OS(WINDOWS) || OS(DARWIN) ComplexTextController it(this, run); @@ -153,7 +153,7 @@ float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFon #endif } -int Font::offsetForPositionForComplexText(const TextRun& run, int x, bool includePartialGlyphs) const +int Font::offsetForPositionForComplexText(const TextRun& run, float x, bool includePartialGlyphs) const { #if OS(WINDOWS) || OS(DARWIN) ComplexTextController controller(this, run); |