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

src/core/SkRTree.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRTree.h"
 #include "SkTSort.h"
 
@@ skipping 327 matching lines @@
             ++numBranches;
             // If the remainder isn't enough to fill a node, we'll need to add fewer nodes to
             // some other branches to make up for it
             if (remainder >= fMinChildren) {
                 remainder = 0;
             } else {
                 remainder = fMinChildren - remainder;
             }
         }
 
-        int numStrips = SkScalarCeil(SkScalarSqrt(SkIntToScalar(numBranches) *
+        int numStrips = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(numBranches) *
                                      SkScalarInvert(fAspectRatio)));
-        int numTiles = SkScalarCeil(SkIntToScalar(numBranches) /
+        int numTiles = SkScalarCeilToInt(SkIntToScalar(numBranches) /
                                     SkIntToScalar(numStrips));
         int currentBranch = 0;
 
         for (int i = 0; i < numStrips; ++i) {
             // Once again, if we are told to do so, we sort by x.
             if (fSortWhenBulkLoading) {
                 int begin = currentBranch;
                 int end = currentBranch + numTiles * fMaxChildren - SkMin32(remainder,
                         (fMaxChildren - fMinChildren) * numTiles);
                 if (end > branches->count()) {
@@ skipping 112 matching lines @@
 
 // Expand 'out' to include 'joinWith'
 static inline void join_no_empty_check(const SkIRect& joinWith, SkIRect* out) {
     // since we check for empty bounds on insert, we know we'll never have empty rects
     // and we can save the empty check that SkIRect::join requires
     if (joinWith.fLeft < out->fLeft) { out->fLeft = joinWith.fLeft; }
     if (joinWith.fTop < out->fTop) { out->fTop = joinWith.fTop; }
     if (joinWith.fRight > out->fRight) { out->fRight = joinWith.fRight; }
     if (joinWith.fBottom > out->fBottom) { out->fBottom = joinWith.fBottom; }
 }