remove SkFloatToScalar macro

samplecode/SampleApp.cpp

Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 04d2cdd785729032dda9e1d532e1a4ee32df0d4f..bb22685e249a119d514402e615a96bb34e916b0e 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -658,8 +658,8 @@ static bool curr_title(SkWindow* wind, SkString* title) {
 
 void SampleWindow::setZoomCenter(float x, float y)
 {
-    fZoomCenterX = SkFloatToScalar(x);
-    fZoomCenterY = SkFloatToScalar(y);
+    fZoomCenterX = x;
+    fZoomCenterY = y;
 }
 
 bool SampleWindow::zoomIn()
@@ -1550,7 +1550,7 @@ static SkBitmap::Config cycle_configs(SkBitmap::Config c) {
 }
 
 void SampleWindow::changeZoomLevel(float delta) {
-    fZoomLevel += SkFloatToScalar(delta);
+    fZoomLevel += delta;
     if (fZoomLevel > 0) {
         fZoomLevel = SkMinScalar(fZoomLevel, MAX_ZOOM_LEVEL);
         fZoomScale = fZoomLevel + SK_Scalar1;