Move makeSpace and resetToSize from SkPathRef.cpp to .h

src/core/SkPathRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBuffer.h"
 #include "SkPath.h"
 #include "SkPathRef.h"
@@ skipping 218 matching lines @@
     // a copy then presumably we intend to make a modification immediately afterwards.
     fGenerationID = ref.fGenerationID;
     fBoundsIsDirty = ref.fBoundsIsDirty;
     if (!fBoundsIsDirty) {
         fBounds = ref.fBounds;
         fIsFinite = ref.fIsFinite;
     }
     SkDEBUGCODE(this->validate();)
 }
 
-void SkPathRef::resetToSize(int verbCount, int pointCount, int conicCount,
-                            int reserveVerbs, int reservePoints) {
-    SkDEBUGCODE(this->validate();)
-    fBoundsIsDirty = true;      // this also invalidates fIsFinite
-    fGenerationID = 0;
-
-    size_t newSize = sizeof(uint8_t) * verbCount + sizeof(SkPoint) * pointCount;
-    size_t newReserve = sizeof(uint8_t) * reserveVerbs + sizeof(SkPoint) * reservePoints;
-    size_t minSize = newSize + newReserve;
-
-    ptrdiff_t sizeDelta = this->currSize() - minSize;
-
-    if (sizeDelta < 0 || static_cast<size_t>(sizeDelta) >= 3 * minSize) {
-        sk_free(fPoints);
-        fPoints = NULL;
-        fVerbs = NULL;
-        fFreeSpace = 0;
-        fVerbCnt = 0;
-        fPointCnt = 0;
-        this->makeSpace(minSize);
-        fVerbCnt = verbCount;
-        fPointCnt = pointCount;
-        fFreeSpace -= newSize;
-    } else {
-        fPointCnt = pointCount;
-        fVerbCnt = verbCount;
-        fFreeSpace = this->currSize() - minSize;
-    }
-    fConicWeights.setCount(conicCount);
-    SkDEBUGCODE(this->validate();)
-}
-
 SkPoint* SkPathRef::growForVerb(int /* SkPath::Verb*/ verb) {
     SkDEBUGCODE(this->validate();)
     int pCnt;
     switch (verb) {
         case SkPath::kMove_Verb:
             pCnt = 1;
             break;
         case SkPath::kLine_Verb:
             pCnt = 1;
             break;
@@ skipping 20 matching lines @@
     this->fVerbs[~fVerbCnt] = verb;
     SkPoint* ret = fPoints + fPointCnt;
     fVerbCnt += 1;
     fPointCnt += pCnt;
     fFreeSpace -= space;
     fBoundsIsDirty = true;  // this also invalidates fIsFinite
     SkDEBUGCODE(this->validate();)
     return ret;
 }
 
-void SkPathRef::makeSpace(size_t size) {
-    SkDEBUGCODE(this->validate();)
-    ptrdiff_t growSize = size - fFreeSpace;
-    if (growSize <= 0) {
-        return;
-    }
-    size_t oldSize = this->currSize();
-    // round to next multiple of 8 bytes
-    growSize = (growSize + 7) & ~static_cast<size_t>(7);
-    // we always at least double the allocation
-    if (static_cast<size_t>(growSize) < oldSize) {
-        growSize = oldSize;
-    }
-    if (growSize < kMinSize) {
-        growSize = kMinSize;
-    }
-    size_t newSize = oldSize + growSize;
-    // Note that realloc could memcpy more than we need. It seems to be a win anyway. TODO:
-    // encapsulate this.
-    fPoints = reinterpret_cast<SkPoint*>(sk_realloc_throw(fPoints, newSize));
-    size_t oldVerbSize = fVerbCnt * sizeof(uint8_t);
-    void* newVerbsDst = reinterpret_cast<void*>(
-                            reinterpret_cast<intptr_t>(fPoints) + newSize - oldVerbSize);
-    void* oldVerbsSrc = reinterpret_cast<void*>(
-                            reinterpret_cast<intptr_t>(fPoints) + oldSize - oldVerbSize);
-    memmove(newVerbsDst, oldVerbsSrc, oldVerbSize);
-    fVerbs = reinterpret_cast<uint8_t*>(reinterpret_cast<intptr_t>(fPoints) + newSize);
-    fFreeSpace += growSize;
-    SkDEBUGCODE(this->validate();)
-}
-
 int32_t SkPathRef::genID() const {
     SkASSERT(!fEditorsAttached);
     if (!fGenerationID) {
         if (0 == fPointCnt && 0 == fVerbCnt) {
             fGenerationID = kEmptyGenID;
         } else {
             static int32_t  gPathRefGenerationID;
             // do a loop in case our global wraps around, as we never want to return a 0 or the
             // empty ID
             do {
@@ skipping 25 matching lines @@
                         fPoints[i].fY >= fBounds.fTop && fPoints[i].fY <= fBounds.fBottom);
             if (!fPoints[i].isFinite()) {
                 isFinite = false;
             }
         }
         SkASSERT(SkToBool(fIsFinite) == isFinite);
     }
 #endif
 }
 #endif