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

tests/PathCoverageTest.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 "Test.h"
 #include "TestClassDef.h"
 #include "SkMath.h"
 #include "SkPoint.h"
 #include "SkScalar.h"
 
 /*
    Duplicates lots of code from gpu/src/GrPathUtils.cpp
    It'd be nice not to do so, but that code's set up currently to only have
    a single implementation.
 */
 
 // Sk uses 6, Gr (implicitly) used 10, both apparently arbitrarily.
 #define MAX_COEFF_SHIFT     6
 static const uint32_t MAX_POINTS_PER_CURVE = 1 << MAX_COEFF_SHIFT;
 
 // max + 0.5 min has error [0.0, 0.12]
 // max + 0.375 min has error [-.03, 0.07]
 // 0.96043387 max + 0.397824735 min has error [-.06, +.05]
 // For determining the maximum possible number of points to use in
 // drawing a quadratic, we want to err on the high side.
 static inline int cheap_distance(SkScalar dx, SkScalar dy) {
-    int idx = SkAbs32(SkScalarRound(dx));
-    int idy = SkAbs32(SkScalarRound(dy));
+    int idx = SkAbs32(SkScalarRoundToInt(dx));
+    int idy = SkAbs32(SkScalarRoundToInt(dy));
     if (idx > idy) {
         idx += idy >> 1;
     } else {
         idx = idy + (idx >> 1);
     }
     return idx;
 }
 
 static inline int estimate_distance(const SkPoint points[]) {
     return cheap_distance(points[1].fX * 2 - points[2].fX - points[0].fX,
@@ skipping 30 matching lines @@
     return estimate_pointCount(distance);
 }
 
 static uint32_t quadraticPointCount_EC(const SkPoint points[], SkScalar tol) {
     int distance = estimate_distance(points);
     return compute_pointCount(SkIntToScalar(distance), tol);
 }
 
 static uint32_t quadraticPointCount_CE(const SkPoint points[]) {
     SkScalar distance = compute_distance(points);
-    return estimate_pointCount(SkScalarRound(distance));
+    return estimate_pointCount(SkScalarRoundToInt(distance));
 }
 
 static uint32_t quadraticPointCount_CC(const SkPoint points[], SkScalar tol) {
     SkScalar distance = compute_distance(points);
     return compute_pointCount(distance, tol);
 }
 
 // Curve from samplecode/SampleSlides.cpp
 static const int gXY[] = {
     4, 0, 0, -4, 8, -4, 12, 0, 8, 4, 0, 4
@@ skipping 65 matching lines @@
     one_d_pe(gSawtooth, SK_ARRAY_COUNT(gSawtooth), reporter);
     one_d_pe(gOvalish, SK_ARRAY_COUNT(gOvalish), reporter);
     one_d_pe(gSharpSawtooth, SK_ARRAY_COUNT(gSharpSawtooth), reporter);
     one_d_pe(gRibbon, SK_ARRAY_COUNT(gRibbon), reporter);
 }
 
 DEF_TEST(PathCoverage, reporter) {
     TestQuadPointCount(reporter);
 
 }