commit 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
tree dae12c217068df2844c0ce18fb2c62311ae8c5e9
parent 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54

remove SkFloatToScalar macro

BUG=
R=reed@google.com, djsollen@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/85463005

git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/ParsePathTest.cpp

diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index c911860..4d0fdba 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -34,8 +34,8 @@
     { "", { 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 @@
     }
 
     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);
 }