remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

samplecode/SampleCircle.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkPaint.h"
 
 // ensure that we don't accidentally screw up the bounds when the oval is
 // fractional, and the impl computes the center and radii, and uses them to
 // reconstruct the edges of the circle.
 // see bug# 1504910
 static void test_circlebounds(SkCanvas*) {
-#ifdef SK_SCALAR_IS_FLOAT
     SkRect r = { 1.39999998f, 1, 21.3999996f, 21 };
     SkPath p;
     p.addOval(r);
     SkASSERT(r == p.getBounds());
-#endif
 }
 
 class CircleView : public SampleView {
 public:
     static const SkScalar ANIM_DX;
     static const SkScalar ANIM_DY;
     static const SkScalar ANIM_RAD;
     SkScalar fDX, fDY, fRAD;
 
     CircleView() {
@@ skipping 91 matching lines @@
 };
 
 const SkScalar CircleView::ANIM_DX(SK_Scalar1 / 67);
 const SkScalar CircleView::ANIM_DY(SK_Scalar1 / 29);
 const SkScalar CircleView::ANIM_RAD(SK_Scalar1 / 19);
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new CircleView; }
 static SkViewRegister reg(MyFactory);