From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm') diff --git a/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm b/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm index 6a4fa03..2383006 100644 --- a/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm +++ b/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm @@ -112,14 +112,14 @@ static NSColor* createPatternColor(NSString* name, NSColor* defaultColor, bool& } // WebKit on Mac is a standard platform component, so it must use the standard platform artwork for underline. -void GraphicsContext::drawLineForTextChecking(const IntPoint& point, int width, TextCheckingLineStyle style) +void GraphicsContext::drawLineForTextChecking(const FloatPoint& point, float width, TextCheckingLineStyle style) { if (paintingDisabled()) return; // These are the same for misspelling or bad grammar. int patternHeight = cMisspellingLineThickness; - int patternWidth = cMisspellingLinePatternWidth; + float patternWidth = cMisspellingLinePatternWidth; bool usingDot; NSColor *patternColor; @@ -165,7 +165,7 @@ void GraphicsContext::drawLineForTextChecking(const IntPoint& point, int width, // space between adjacent misspelled words was underlined. if (usingDot) { // allow slightly more considering that the pattern ends with a transparent pixel - int widthMod = width % patternWidth; + float widthMod = fmodf(width, patternWidth); if (patternWidth - widthMod > cMisspellingLinePatternGapWidth) width -= widthMod; } -- cgit v1.1