Restore SkPath(const SkPath&) to copy the generation ID on Android.

include/core/SkPath.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkPath_DEFINED
@@ skipping 22 matching lines @@
 /** \class SkPath
 
     The SkPath class encapsulates compound (multiple contour) geometric paths
     consisting of straight line segments, quadratic curves, and cubic curves.
 */
 class SK_API SkPath {
 public:
     SK_DECLARE_INST_COUNT_ROOT(SkPath);
 
     SkPath();
-    SkPath(const SkPath&);
+    SkPath(const SkPath&);             // Copies fGenerationID on Android.
+    SkPath& operator=(const SkPath&);  // Increments fGenerationID on Android.

[reed1, 2013/08/06 21:15:09]

:( nit: Skia mostly likes only constructors/destruct in the first block.

[mtklein, 2013/08/06 21:18:47]

Done.

     ~SkPath();
 
-    SkPath& operator=(const SkPath&);
-
     friend  SK_API bool operator==(const SkPath&, const SkPath&);
     friend bool operator!=(const SkPath& a, const SkPath& b) {
         return !(a == b);
     }
 
     enum FillType {
         /** Specifies that "inside" is computed by a non-zero sum of signed
             edge crossings
         */
         kWinding_FillType,
@@ skipping 102 matching lines @@
      *
      * @return true if this path is an oval.
      *              Tracking whether a path is an oval is considered an
      *              optimization for performance and so some paths that are in
      *              fact ovals can report false.
      */
     bool isOval(SkRect* rect) const;
 
     /** Clear any lines and curves from the path, making it empty. This frees up
         internal storage associated with those segments.
-        This does NOT change the fill-type setting nor isConvex

[reed1, 2013/08/06 21:15:09]

Were these comments wrong or misleading?

[mtklein, 2013/08/06 21:18:47]

Yes, wrong.  The same CL that caused the bug changed these too.  They both set
fill type to winding and convexity to unknown now.

     */
     void reset();
 
     /** Similar to reset(), in that all lines and curves are removed from the
         path. However, any internal storage for those lines/curves is retained,
         making reuse of the path potentially faster.
-        This does NOT change the fill-type setting nor isConvex
     */
     void rewind();
 
     /** Returns true if the path is empty (contains no lines or curves)
 
         @return true if the path is empty (contains no lines or curves)
     */
     bool isEmpty() const;
 
     /**
@@ skipping 770 matching lines @@
 #endif
 
     /** Resets all fields other than fPathRef to their initial 'empty' values.
      *  Assumes the caller has already emptied fPathRef.
      *  On Android increments fGenerationID without reseting it.
      */
     void resetFields();
 
     /** Sets all fields other than fPathRef to the values in 'that'.
      *  Assumes the caller has already set fPathRef.
-     *  On Android increments fGenerationID without copying it.
-     *  On Android sets fSourcePath to NULL.
+     *  Doesn't change fGenerationID or fSourcePath on Android.
      */
     void copyFields(const SkPath& that);
 
     // called, if dirty, by getBounds()
     void computeBounds() const;
 
     friend class Iter;
 
     friend class SkPathStroker;
     /*  Append the first contour of path, ignoring path's initial point. If no
@@ skipping 23 matching lines @@
     bool isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts,
                        bool* isClosed, Direction* direction) const;
 
     friend class SkAutoPathBoundsUpdate;
     friend class SkAutoDisableOvalCheck;
     friend class SkAutoDisableDirectionCheck;
     friend class SkBench_AddPathTest; // perf test pathTo/reversePathTo
 };
 
 #endif