SkPath::rewind needs to have same reset as SkPath::reset.

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBuffer.h"
@@ skipping 201 matching lines @@
 
 // flag to require a moveTo if we begin with something else, like lineTo etc.
 #define INITIAL_LASTMOVETOINDEX_VALUE   ~0
 
 SkPath::SkPath()
 #if SK_DEBUG_PATH_REF
     : fPathRef(SkPathRef::CreateEmpty(), this)
 #else
     : fPathRef(SkPathRef::CreateEmpty())
 #endif
+    , fLastMoveToIndex(INITIAL_LASTMOVETOINDEX_VALUE)

[reed1, 2013/06/19 17:36:49]

why not have the constructor also call resetFields()? There is no allocation or
other complication, so no actual value in performing this construct-like syntax
over just an assignment.

[bungeman-skia, 2013/06/19 19:59:48]

Done.

     , fFillType(kWinding_FillType)
-    , fBoundsIsDirty(true) {
+    , fSegmentMask(0)
+    , fBoundsIsDirty(true)
+    , fConvexity(kUnknown_Convexity)
+    , fDirection(kUnknown_Direction)
+    , fIsFinite(false)  // gets computed when we know our bounds
+    , fIsOval(false)
+#ifdef SK_BUILD_FOR_ANDROID
+    , fGenerationID(0)
+    , fSourcePath(NULL)
+#endif
+{ }
+

[caryclark, 2013/06/19 17:38:21]

could this be
#ifdef SK_BUILD_FOR_ANDROID
    , fGenerationID(-1)
#endif
{
    this->resetFields();
}

?

[bungeman-skia, 2013/06/19 19:59:48]

Done.

+void SkPath::resetFields() {
+    //fPathRef is assumed to have been emptied by the caller.
+    fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
+    fFillType = kWinding_FillType;
+    fSegmentMask = 0;
+    fBoundsIsDirty = true;
     fConvexity = kUnknown_Convexity;
     fDirection = kUnknown_Direction;
-    fSegmentMask = 0;
-    fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
+    fIsFinite = false;
     fIsOval = false;
-    fIsFinite = false;  // gets computed when we know our bounds
 #ifdef SK_BUILD_FOR_ANDROID
-    fGenerationID = 0;
+    GEN_ID_INC;
     fSourcePath = NULL;
 #endif
 }
 
 SkPath::SkPath(const SkPath& src)
 #if SK_DEBUG_PATH_REF
     : fPathRef(this)
+#else
+    : fPathRef(SkRef(src.fPathRef.get()))
+#endif
+    , fBounds(src.fBounds)
+    , fLastMoveToIndex(src.fLastMoveToIndex)
+    , fFillType(src.fFillType)
+    , fSegmentMask(src.fSegmentMask)
+    , fBoundsIsDirty(src.fBoundsIsDirty)
+    , fConvexity(src.fConvexity)
+    , fDirection(src.fDirection)
+    , fIsFinite(src.fIsFinite)
+    , fIsOval(src.fIsOval)
+#ifdef SK_BUILD_FOR_ANDROID
+    , fGenerationID(src.fGenerationID)
+    , fSourcePath(NULL)
 #endif
 {
     SkDEBUGCODE(src.validate();)
-    src.fPathRef.get()->ref();
-    fPathRef.reset(src.fPathRef.get());
-    fBounds         = src.fBounds;
-    fFillType       = src.fFillType;
-    fBoundsIsDirty  = src.fBoundsIsDirty;
-    fConvexity      = src.fConvexity;
-    fDirection      = src.fDirection;
-    fIsFinite       = src.fIsFinite;
-    fSegmentMask    = src.fSegmentMask;
-    fLastMoveToIndex = src.fLastMoveToIndex;
-    fIsOval         = src.fIsOval;
-#ifdef SK_BUILD_FOR_ANDROID
-    fGenerationID = src.fGenerationID;
-    fSourcePath = NULL;
-#endif
 }
 
 SkPath::~SkPath() {
     SkDEBUGCODE(this->validate();)
 }
 
 SkPath& SkPath::operator=(const SkPath& src) {
     SkDEBUGCODE(src.validate();)
 
     if (this != &src) {
-        src.fPathRef.get()->ref();
-        fPathRef.reset(src.fPathRef.get());
-        fBounds         = src.fBounds;
-        fFillType       = src.fFillType;
-        fBoundsIsDirty  = src.fBoundsIsDirty;
-        fConvexity      = src.fConvexity;
-        fDirection      = src.fDirection;
-        fIsFinite       = src.fIsFinite;
-        fSegmentMask    = src.fSegmentMask;
+        fPathRef.reset(SkRef(src.fPathRef.get()));
+        fBounds          = src.fBounds;
         fLastMoveToIndex = src.fLastMoveToIndex;
-        fIsOval         = src.fIsOval;
+        fFillType        = src.fFillType;
+        fSegmentMask     = src.fSegmentMask;
+        fBoundsIsDirty   = src.fBoundsIsDirty;
+        fConvexity       = src.fConvexity;
+        fDirection       = src.fDirection;
+        fIsFinite        = src.fIsFinite;
+        fIsOval          = src.fIsOval;
+#ifdef SK_BUILD_FOR_ANDROID
         GEN_ID_INC;
+        fSourcePath      = NULL;
+#endif
     }
     SkDEBUGCODE(this->validate();)
     return *this;
 }
 
 SK_API bool operator==(const SkPath& a, const SkPath& b) {
     // note: don't need to look at isConvex or bounds, since just comparing the
     // raw data is sufficient.
 
     // We explicitly check fSegmentMask as a quick-reject. We could skip it,
@@ skipping 115 matching lines @@
 
 void SkPath::setSourcePath(const SkPath* path) {
     fSourcePath = path;
 }
 #endif
 
 void SkPath::reset() {
     SkDEBUGCODE(this->validate();)
 
     fPathRef.reset(SkPathRef::CreateEmpty());
-    GEN_ID_INC;
-    fBoundsIsDirty = true;
-    fConvexity = kUnknown_Convexity;
-    fDirection = kUnknown_Direction;
-    fSegmentMask = 0;
-    fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
-    fIsOval = false;
+    this->resetFields();
 }
 
 void SkPath::rewind() {
     SkDEBUGCODE(this->validate();)
 
     SkPathRef::Rewind(&fPathRef);
-    GEN_ID_INC;
-    fConvexity = kUnknown_Convexity;
-    fBoundsIsDirty = true;
-    fSegmentMask = 0;
-    fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
-    fIsOval = false;
+    this->resetFields();
 }
 
 bool SkPath::isEmpty() const {
     SkDEBUGCODE(this->validate();)
     return 0 == fPathRef->countVerbs();
 }
 
 bool SkPath::isLine(SkPoint line[2]) const {
     int verbCount = fPathRef->countVerbs();
     int ptCount = fPathRef->countVerbs();
@@ skipping 2612 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }