Move fLastMoveToIndex from SkPath to SkPathRef

include/core/SkPathRef.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPathRef_DEFINED
 #define SkPathRef_DEFINED
@@ skipping 86 matching lines @@
 
         /**
          * Gets the path ref that is wrapped in the Editor.
          */
         SkPathRef* pathRef() { return fPathRef; }
 
         void setIsOval(bool isOval) { fPathRef->setIsOval(isOval); }
 
         void setBounds(const SkRect& rect) { fPathRef->setBounds(rect); }
 
+        // In some cases we need to inject a leading moveTo before we add points
+        // for lineTo, quadTo, conicTo, cubicTo
+        // 
+        // SkPath path; path.lineTo(...);   <--- need a leading moveTo(0, 0)
+        // SkPath path; ... path.close(); path.lineTo(...) <-- need a moveTo(previous moveTo)
+        void injectMoveToIfNeeded() { fPathRef->injectMoveToIfNeeded(); }
+
     private:
         SkPathRef* fPathRef;
     };
 
 public:
     /**
      * Gets a path ref with no verbs or points.
      */
     static SkPathRef* CreateEmpty();
 
@@ skipping 130 matching lines @@
     uint32_t writeSize() const;
 
     /**
      * Gets an ID that uniquely identifies the contents of the path ref. If two path refs have the
      * same ID then they have the same verbs and points. However, two path refs may have the same
      * contents but different genIDs.
      */
     uint32_t genID() const;
 
 private:
+    // flag to require a moveTo if we begin with something else, like lineTo etc.
+    static const int kINITIAL_LASTMOVETOINDEX_VALUE = ~0;
+
     enum SerializationOffsets {
         kIsFinite_SerializationShift = 25,  // requires 1 bit
         kIsOval_SerializationShift = 24,    // requires 1 bit
         kSegmentMask_SerializationShift = 0 // requires 4 bits
     };
 
     SkPathRef() {
+        fLastMoveToIndex = kINITIAL_LASTMOVETOINDEX_VALUE;
         fBoundsIsDirty = true;    // this also invalidates fIsFinite
         fPointCnt = 0;
         fVerbCnt = 0;
         fVerbs = NULL;
         fPoints = NULL;
         fFreeSpace = 0;
         fGenerationID = kEmptyGenID;
         fSegmentMask = 0;
         fIsOval = false;
         SkDEBUGCODE(fEditorsAttached = 0;)
@@ skipping 67 matching lines @@
             fFreeSpace -= newSize;
         } else {
             fPointCnt = pointCount;
             fVerbCnt = verbCount;
             fFreeSpace = this->currSize() - minSize;
         }
         fConicWeights.setCount(conicCount);
         SkDEBUGCODE(this->validate();)
     }
 
+    void injectMoveToIfNeeded();
+
     /**
      * Increases the verb count by numVbs and point count by the required amount.
      * The new points are uninitialized. All the new verbs are set to the specified
      * verb. If 'verb' is kConic_Verb, 'weights' will return a pointer to the
      * uninitialized conic weights.
      */
     SkPoint* growForRepeatedVerb(int /*SkPath::Verb*/ verb, int numVbs, SkScalar** weights);
 
     /**
      * Increases the verb count 1, records the new verb, and creates room for the requisite number
@@ skipping 65 matching lines @@
         SkDEBUGCODE(this->validate();)
         fIsOval = false;
         return fPoints;
     }
 
     enum {
         kMinSize = 256,
     };
 
     mutable SkRect      fBounds;
+    int                 fLastMoveToIndex;
     uint8_t             fSegmentMask;
     mutable uint8_t     fBoundsIsDirty;
     mutable SkBool8     fIsFinite;    // only meaningful if bounds are valid
     mutable SkBool8     fIsOval;
 
     SkPoint*            fPoints; // points to begining of the allocation
     uint8_t*            fVerbs; // points just past the end of the allocation (verbs grow backwards)
     int                 fVerbCnt;
     int                 fPointCnt;
     size_t              fFreeSpace; // redundant but saves computation
     SkTDArray<SkScalar> fConicWeights;
 
     enum {
         kEmptyGenID = 1, // GenID reserved for path ref with zero points and zero verbs.
     };
     mutable uint32_t    fGenerationID;
     SkDEBUGCODE(int32_t fEditorsAttached;) // assert that only one editor in use at any time.
 
     friend class PathRefTest_Private;
     typedef SkRefCnt INHERITED;
 };
 
 #endif