deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

samplecode/SampleDegenerateTwoPtRadials.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"
@@ skipping 40 matching lines @@
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "DegenerateTwoPtRadials");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
         fTime += SampleCode::GetAnimSecondsDelta();
         SkScalar delta = fTime / 15.f;
-        int intPart = SkScalarFloor(delta);
+        int intPart = SkScalarFloorToInt(delta);
         delta = delta - SK_Scalar1 * intPart;
         if (intPart % 2) {
             delta = SK_Scalar1 - delta;
         }
         delta -= SK_ScalarHalf;
         static const int DELTA_SCALE = 500;
         delta /= DELTA_SCALE;
 
         SkScalar w = SK_Scalar1 * 500;
         SkScalar h = SK_Scalar1 * 500;
@@ skipping 11 matching lines @@
 
 private:
     SkScalar           fTime;
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DegenerateTwoPtRadialsView; }
 static SkViewRegister reg(MyFactory);