remove SkFloatToScalar macro

gm/colormatrix.cpp

Index: gm/colormatrix.cpp
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 16086f0346ba7dedd893245c4d3964a2e8d33880..9ab65630400e2af30ef5be564cfea7c25638d9f7 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -122,19 +122,19 @@ protected:
             setColorMatrix(&paint, matrix);
             canvas->drawBitmap(bmps[i], 240, 0, &paint);
 
-            matrix.setSaturation(SkFloatToScalar(0.0f));
+            matrix.setSaturation(0.0f);
             setColorMatrix(&paint, matrix);
             canvas->drawBitmap(bmps[i], 0, 80, &paint);
 
-            matrix.setSaturation(SkFloatToScalar(0.5f));
+            matrix.setSaturation(0.5f);
             setColorMatrix(&paint, matrix);
             canvas->drawBitmap(bmps[i], 80, 80, &paint);
 
-            matrix.setSaturation(SkFloatToScalar(1.0f));
+            matrix.setSaturation(1.0f);
             setColorMatrix(&paint, matrix);
             canvas->drawBitmap(bmps[i], 160, 80, &paint);
 
-            matrix.setSaturation(SkFloatToScalar(2.0f));
+            matrix.setSaturation(2.0f);
             setColorMatrix(&paint, matrix);
             canvas->drawBitmap(bmps[i], 240, 80, &paint);