Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1689)

Unified Diff: tests/ParsePathTest.cpp

Issue 85463005: remove SkFloatToScalar macro (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add flag to expose SkFloatToScalar to chromium Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/PaintTest.cpp ('k') | tests/PathMeasureTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/ParsePathTest.cpp
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index c91186005a0d28f4e2badd083b570a4997f1456e..4d0fdba2b8101f77a1674463069a338273a3b3d7 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -34,8 +34,8 @@ static struct {
{ "", { 0, 0, 0, 0 } },
{ "M0,0L10,10", { 0, 0, SkIntToScalar(10), SkIntToScalar(10) } },
{ "M-5.5,-0.5 Q 0 0 6,6.50",
- { SkFloatToScalar(-5.5f), SkFloatToScalar(-0.5f),
- SkFloatToScalar(6), SkFloatToScalar(6.5f) } }
+ { -5.5f, -0.5f,
+ 6, 6.5f } }
};
static void TestParsePath(skiatest::Reporter* reporter) {
@@ -51,13 +51,13 @@ static void TestParsePath(skiatest::Reporter* reporter) {
}
SkRect r;
- r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f));
+ r.set(0, 0, 10, 10.5f);
SkPath p;
p.addRect(r);
test_to_from(reporter, p);
p.addOval(r);
test_to_from(reporter, p);
- p.addRoundRect(r, SkFloatToScalar(4), SkFloatToScalar(4.5f));
+ p.addRoundRect(r, 4, 4.5f);
test_to_from(reporter, p);
}
« no previous file with comments | « tests/PaintTest.cpp ('k') | tests/PathMeasureTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698