remove SkFloatToScalar macro

src/views/SkTouchGesture.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 32 matching lines @@
         unit->fX = 0;
         unit->fY = SkScalarSignNonZero(unit->fY);
     } else if (SkScalarAbs(unit->fY) < TOLERANCE) {
         unit->fX = SkScalarSignNonZero(unit->fX);
         unit->fY = 0;
     }
 }
 
 void SkFlingState::reset(float sx, float sy) {
     fActive = true;
-    fDirection.set(SkFloatToScalar(sx), SkFloatToScalar(sy));
+    fDirection.set(sx, sy);
     fSpeed0 = SkPoint::Normalize(&fDirection);
     fSpeed0 = pin_max_fling(fSpeed0);
     fTime0 = getseconds();
 
     unit_axis_align(&fDirection);
 //    printf("---- speed %g dir %g %g\n", fSpeed0, fDirection.fX, fDirection.fY);
 }
 
 bool SkFlingState::evaluateMatrix(SkMatrix* matrix) {
     if (!fActive) {
@@ skipping 11 matching lines @@
     }
     float dist = (fSpeed0 - speed) / K0;
 
 //    printf("---- time %g speed %g dist %g\n", t, speed, dist);
     float tx = fDirection.fX * dist;
     float ty = fDirection.fY * dist;
     if (DISCRETIZE_TRANSLATE_TO_AVOID_FLICKER) {
         tx = (float)sk_float_round2int(tx);
         ty = (float)sk_float_round2int(ty);
     }
-    matrix->setTranslate(SkFloatToScalar(tx), SkFloatToScalar(ty));
+    matrix->setTranslate(tx, ty);
 //    printf("---- evaluate (%g %g)\n", tx, ty);
 
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const SkMSec MAX_DBL_TAP_INTERVAL = 300;
 static const float MAX_DBL_TAP_DISTANCE = 100;
 static const float MAX_JITTER_RADIUS = 2;
@@ skipping 79 matching lines @@
 int SkTouchGesture::findRec(void* owner) const {
     for (int i = 0; i < fTouches.count(); i++) {
         if (owner == fTouches[i].fOwner) {
             return i;
         }
     }
     return -1;
 }
 
 static SkScalar center(float pos0, float pos1) {
-    return SkFloatToScalar((pos0 + pos1) * 0.5f);
+    return (pos0 + pos1) * 0.5f;
 }
 
 static const float MAX_ZOOM_SCALE = 4;
 static const float MIN_ZOOM_SCALE = 0.25f;
 
 float SkTouchGesture::limitTotalZoom(float scale) const {
     // this query works 'cause we know that we're square-scale w/ no skew/rotation
     const float curr = SkScalarToFloat(fGlobalM[0]);
 
     if (scale > 1 && curr * scale > MAX_ZOOM_SCALE) {
@@ skipping 122 matching lines @@
             fTouches.reset();
             fState = kEmpty_State;
             found = true;
         }
     }
 
     fLastUpT = now;
     fLastUpP.set(x, y);
     return found;
 }