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/PaintTest.cpp

diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 045c2d2..03c93d4 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -193,14 +193,14 @@
     SkPath path, stroke;
     SkPaint paint;
 
-    path.moveTo(SkFloatToScalar(460.2881309415525f),
-                SkFloatToScalar(303.250847066498f));
-    path.cubicTo(SkFloatToScalar(463.36378422175284f),
-                 SkFloatToScalar(302.1169735073363f),
-                 SkFloatToScalar(456.32239330810046f),
-                 SkFloatToScalar(304.720354932878f),
-                 SkFloatToScalar(453.15255460013304f),
-                 SkFloatToScalar(305.788586869862f));
+    path.moveTo(460.2881309415525f,
+                303.250847066498f);
+    path.cubicTo(463.36378422175284f,
+                 302.1169735073363f,
+                 456.32239330810046f,
+                 304.720354932878f,
+                 453.15255460013304f,
+                 305.788586869862f);
 
     SkRect fillR, strokeR;
     fillR = path.getBounds();
@@ -225,13 +225,13 @@
 static void regression_measureText(skiatest::Reporter* reporter) {
 
     SkPaint paint;
-    paint.setTextSize(SkFloatToScalar(12.0f));
+    paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
-    paint.measureText("", 0, &r, SkFloatToScalar(1.0f));
+    paint.measureText("", 0, &r, 1.0f);
     REPORTER_ASSERT(reporter, r.isEmpty());
 }