summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-07-01 17:04:06 -0700
committerRussell Brenner <russellbrenner@google.com>2011-07-01 17:20:50 -0700
commit69efdf7b2cd8f4956d7cc03dc3d1bbf9b8e35483 (patch)
treed2f54f8ff0725d4f5a3d26e46c9b49d2065a3071 /Source/WebCore/platform/graphics/android
parentbeb5d5b7abfe05ecd6dccd281a0885e7a9526286 (diff)
downloadexternal_webkit-69efdf7b2cd8f4956d7cc03dc3d1bbf9b8e35483.zip
external_webkit-69efdf7b2cd8f4956d7cc03dc3d1bbf9b8e35483.tar.gz
external_webkit-69efdf7b2cd8f4956d7cc03dc3d1bbf9b8e35483.tar.bz2
Remove old scalar conversions
The webkit merge from CL 112610 introduced an api change in setrectForUnderline, changing two params from int to float. The body of the function, however, was still performing int to float conversions, resulting in a debug assert within skia and conversion results forced to zero. This CL removes the outdated conversion. Change-Id: I0d5fae39552c3e6801b83e6c4363dc063a01b165
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 429a125..e015f5a 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -624,10 +624,10 @@ static void setrectForUnderline(SkRect* r, GraphicsContext* context, const Float
if (lineThickness < 1) // Do we really need/want this?
lineThickness = 1;
#endif
- r->fLeft = SkIntToScalar(point.x());
- r->fTop = SkIntToScalar(point.y() + yOffset);
- r->fRight = r->fLeft + SkIntToScalar(width);
- r->fBottom = r->fTop + SkFloatToScalar(lineThickness);
+ r->fLeft = point.x();
+ r->fTop = point.y() + yOffset;
+ r->fRight = r->fLeft + width;
+ r->fBottom = r->fTop + lineThickness;
}
void GraphicsContext::drawLineForText(const FloatPoint& pt, float width, bool)