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

diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 95e455d..7cadf01 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -9,8 +9,8 @@
 #include "SkMatrix.h"
 #include "SkRRect.h"
 
-static const SkScalar kWidth = SkFloatToScalar(100.0f);
-static const SkScalar kHeight = SkFloatToScalar(100.0f);
+static const SkScalar kWidth = 100.0f;
+static const SkScalar kHeight = 100.0f;
 
 static void test_inset(skiatest::Reporter* reporter) {
     SkRRect rr, rr2;
@@ -510,7 +510,7 @@
 
     // Scale in both directions.
     SkScalar xScale = SkIntToScalar(3);
-    SkScalar yScale = SkFloatToScalar(3.2f);
+    SkScalar yScale = 3.2f;
     matrix.reset();
     matrix.setScaleX(xScale);
     matrix.setScaleY(yScale);