add SkPath::isRRect

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
 
 #include "SkMatrix.h"
 #include "SkPoint.h"
+#include "SkRRect.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
 #include <stddef.h> // ptrdiff_t
 
 class SkRBuffer;
 class SkWBuffer;
 
 /**
  * Holds the path verbs and points. It is versioned by a generation ID. None of its public methods
@@ skipping 69 matching lines @@
             fPathRef->resetToSize(newVerbCnt, newPointCnt, newConicCount);
         }
 
         /**
          * Gets the path ref that is wrapped in the Editor.
          */
         SkPathRef* pathRef() { return fPathRef; }
 
         void setIsOval(bool isOval) { fPathRef->setIsOval(isOval); }
 
+        void setIsRRect(bool isRRect) { fPathRef->setIsRRect(isRRect); }
+
         void setBounds(const SkRect& rect) { fPathRef->setBounds(rect); }
 
     private:
         SkPathRef* fPathRef;
     };
 
+    class SK_API Iter {
+    public:
+        Iter();
+        Iter(const SkPathRef&);
+

[robertphillips, 2015/11/19 22:27:28]

Should this be 'setPathRef' ?

[caryclark, 2015/11/19 22:36:05]

Done.

+        void setPath(const SkPathRef&);
+
+        /** Return the next verb in this iteration of the path. When all
+            segments have been visited, return kDone_Verb.
+
+            @param  pts The points representing the current verb and/or segment
+                        This must not be NULL.
+            @return The verb for the current segment
+        */
+        uint8_t next(SkPoint pts[4]);
+
+        SkScalar conicWeight() const { return *fConicWeights; }
+
+    private:
+        const SkPoint*  fPts;
+        const uint8_t*  fVerbs;
+        const uint8_t*  fVerbStop;
+        const SkScalar* fConicWeights;
+    };
+
 public:
     /**
      * Gets a path ref with no verbs or points.
      */
     static SkPathRef* CreateEmpty();
 
     /**
      *  Returns true if all of the points in this path are finite, meaning there
      *  are no infinities and no NaNs.
      */
@@ skipping 22 matching lines @@
      *              fact ovals can report false.
      */
     bool isOval(SkRect* rect) const {
         if (fIsOval && rect) {
             *rect = getBounds();
         }
 
         return SkToBool(fIsOval);
     }
 
+    bool isRRect(SkRRect* rrect) const {
+        if (fIsRRect && rrect) {

[robertphillips, 2015/11/19 22:27:28]

this->getRRect ?

[caryclark, 2015/11/19 22:36:05]

Done.

+            *rrect = getRRect();
+        }
+        return SkToBool(fIsRRect);
+    }
+
+
     bool hasComputedBounds() const {
         return !fBoundsIsDirty;
     }
 
     /** Returns the bounds of the path's points. If the path contains 0 or 1
         points, the bounds is set to (0,0,0,0), and isEmpty() will return true.
         Note: this bounds may be larger than the actual shape, since curves
         do not extend as far as their control points.
     */
     const SkRect& getBounds() const {
         if (fBoundsIsDirty) {
             this->computeBounds();
         }
         return fBounds;
     }
 
+    SkRRect getRRect() const;
+
     /**
      * Transforms a path ref by a matrix, allocating a new one only if necessary.
      */
     static void CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
                                       const SkPathRef& src,
                                       const SkMatrix& matrix);
 
     static SkPathRef* CreateFromBuffer(SkRBuffer* buffer);
 
     /**
@@ skipping 66 matching lines @@
         virtual ~GenIDChangeListener() {}
         virtual void onChange() = 0;
     };
 
     void addGenIDChangeListener(GenIDChangeListener* listener);
 
     SkDEBUGCODE(void validate() const;)
 
 private:
     enum SerializationOffsets {
+        kIsRRect_SerializationShift = 26,   // requires 1 bit
         kIsFinite_SerializationShift = 25,  // requires 1 bit
         kIsOval_SerializationShift = 24,    // requires 1 bit
         kSegmentMask_SerializationShift = 0 // requires 4 bits
     };
 
     SkPathRef() {
         fBoundsIsDirty = true;    // this also invalidates fIsFinite
         fPointCnt = 0;
         fVerbCnt = 0;
         fVerbs = NULL;
         fPoints = NULL;
         fFreeSpace = 0;
         fGenerationID = kEmptyGenID;
         fSegmentMask = 0;
         fIsOval = false;
+        fIsRRect = false;
         SkDEBUGCODE(fEditorsAttached = 0;)
         SkDEBUGCODE(this->validate();)
     }
 
     void copy(const SkPathRef& ref, int additionalReserveVerbs, int additionalReservePoints);
 
     // Return true if the computed bounds are finite.
     static bool ComputePtBounds(SkRect* bounds, const SkPathRef& ref) {
         return bounds->setBoundsCheck(ref.points(), ref.countPoints());
     }
@@ skipping 27 matching lines @@
     /** Resets the path ref with verbCount verbs and pointCount points, all uninitialized. Also
      *  allocates space for reserveVerb additional verbs and reservePoints additional points.*/
     void resetToSize(int verbCount, int pointCount, int conicCount,
                      int reserveVerbs = 0, int reservePoints = 0) {
         SkDEBUGCODE(this->validate();)
         fBoundsIsDirty = true;      // this also invalidates fIsFinite
         fGenerationID = 0;
 
         fSegmentMask = 0;
         fIsOval = false;
+        fIsRRect = false;
 
         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;
@@ skipping 79 matching lines @@
         return reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints);
     }
 
     /**
      * Called the first time someone calls CreateEmpty to actually create the singleton.
      */
     friend SkPathRef* sk_create_empty_pathref();
 
     void setIsOval(bool isOval) { fIsOval = isOval; }
 
+    void setIsRRect(bool isRRect) { fIsRRect = isRRect; }
+
     SkPoint* getPoints() {
         SkDEBUGCODE(this->validate();)
         fIsOval = false;
+        fIsRRect = false;

[reed1, 2015/11/19 19:28:10]

do we remember why calling this forces us to wack these bits? who are the
callers?

[caryclark, 2015/11/19 20:49:05]

This is only called by the editor.
Added a const flavor that doesn't clear the bits.

         return fPoints;
     }
 
     void callGenIDChangeListeners();
 
     enum {
         kMinSize = 256,
     };
 
     mutable SkRect   fBounds;
     mutable uint8_t  fBoundsIsDirty;
     mutable SkBool8  fIsFinite;    // only meaningful if bounds are valid
 
     SkBool8  fIsOval;

[reed1, 2015/11/19 19:28:10]

we now have 5 bytes in a row, do we want to move all of them to the end of the
list, just for tighter packing?

[caryclark, 2015/11/19 20:49:05]

Done.

+    SkBool8  fIsRRect;
     uint8_t  fSegmentMask;
 
     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.
 
     SkTDArray<GenIDChangeListener*> fGenIDChangeListeners;  // pointers are owned
 
     friend class PathRefTest_Private;
+    friend class ForceIsRRect_Private; // unit test isRRect
     typedef SkRefCnt INHERITED;
 };
 
 #endif