Adding new 'extend' mode to SkPath::addPath

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 684 matching lines @@
      *      this->moveTo(pts[0]);
      *      for (int i = 1; i < count; ++i) {
      *          this->lineTo(pts[i]);
      *      }
      *      if (close) {
      *          this->close();
      *      }
      */
     void addPoly(const SkPoint pts[], int count, bool close);
 
+    enum AddPathMode {
+        /** Source path contours are added as new contours.
+        */
+        kAppend_AddPathMode,
+        /** Path is added by extending the last contour of the destination path
+            with the first contour of the source path. If the last contour of
+            the destination path is closed, it will be pseudo-extended by

[reed1, 2014/02/10 21:03:14]

lets assume dst and src each have only 1 contour

1. if dst is closed, then
    remove the close verb
2. replace the src moveTo with lineTo(?)
3. append the rest of src

Is that correct? I couldn't really tell from your dox.

+            starting a new contour at the last point of the destination path
+            and extending it with the first contour of the source path. It
+            follows that if the first countour of the source path is closed,
+            the new extended contour will close on the last point of the
+            destination path.
+        */
+        kExtend_AddPathMode  
+    };
+
     /** Add a copy of src to the path, offset by (dx,dy)
         @param src  The path to add as a new contour
         @param dx   The amount to translate the path in X as it is added
         @param dx   The amount to translate the path in Y as it is added
     */
-    void addPath(const SkPath& src, SkScalar dx, SkScalar dy);
+    void addPath(const SkPath& src, SkScalar dx, SkScalar dy,
+                 AddPathMode mode = kAppend_AddPathMode);
 
     /** Add a copy of src to the path
     */
-    void addPath(const SkPath& src) {
+    void addPath(const SkPath& src, AddPathMode mode = kAppend_AddPathMode) {
         SkMatrix m;
         m.reset();
-        this->addPath(src, m);
+        this->addPath(src, m, mode);
     }
 
     /** Add a copy of src to the path, transformed by matrix
         @param src  The path to add as a new contour
+        @param matrix  Transform applied to src
+        @param mode  Determines how path is added
     */
-    void addPath(const SkPath& src, const SkMatrix& matrix);
+    void addPath(const SkPath& src, const SkMatrix& matrix, AddPathMode mode = kAppend_AddPathMode);
 
     /**
      *  Same as addPath(), but reverses the src input
      */
     void reverseAddPath(const SkPath& src);
 
     /** Offset the path by (dx,dy), returning true on success
 
         @param dx   The amount in the X direction to offset the entire path
         @param dy   The amount in the Y direction to offset the entire path
@@ skipping 290 matching lines @@
     }
 
     friend class SkAutoPathBoundsUpdate;
     friend class SkAutoDisableOvalCheck;
     friend class SkAutoDisableDirectionCheck;
     friend class SkBench_AddPathTest; // perf test reversePathTo
     friend class PathTest_Private; // unit test reversePathTo
 };
 
 #endif