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

src/views/SkStackViewLayout.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 "SkStackViewLayout.h"
 
 SkStackViewLayout::SkStackViewLayout()
@@ skipping 149 matching lines @@
     SkScalar        flexAmount = 0;
     SkView::B2FIter    iter(parent);
     SkView*            child;
 
     if (flexCount > 0 && parentLimit > childLimit)
         flexAmount = (parentLimit - childLimit) / flexCount;
 
     while ((child = iter.next()) != NULL)
     {
         if (fRound)
-            pos = SkIntToScalar(SkScalarRound(pos));
+            pos = SkScalarRoundToScalar(pos);
         (child->*mainLocP)(pos);
         SkScalar crossLoc = crossStartM + gAlignProcs[fAlign]((child->*crossGetSizeP)(), crossLimit);
         if (fRound)
-            crossLoc = SkIntToScalar(SkScalarRound(crossLoc));
+            crossLoc = SkScalarRoundToScalar(crossLoc);
         (child->*crossLocP)(crossLoc);
 
         if (crossSetSizeP)
             (child->*crossSetSizeP)(crossLimit);
         if (child->getFlags() & flexMask)
             (child->*mainSetSizeP)(flexAmount);
         pos += (child->*mainGetSizeP)() + fSpacer;
     }
 }
 
@@ skipping 79 matching lines @@
         child->setSize(    parent->width() - fMargin.fRight - fMargin.fLeft,
                         parent->height() - fMargin.fBottom - fMargin.fTop);
     }
 }
 
 void SkFillViewLayout::onInflate(const SkDOM& dom, const SkDOM::Node* node)
 {
     this->INHERITED::onInflate(dom, node);
     (void)dom.findScalars(node, "margin", (SkScalar*)&fMargin, 4);
 }