Add support for building GrShape from SkPath and more tests

src/gpu/GrShape.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrShape_DEFINED
 #define GrShape_DEFINED
 
@@ skipping 18 matching lines @@
  *
  * Currently this can only be constructed from a rrect, though it can become a path by applying
  * style to the geometry. The idea is to expand this to cover most or all of the geometries that
  * have SkCanvas::draw APIs.
  */
 class GrShape {
 public:
     GrShape() : fType(Type::kEmpty) {}
 
     explicit GrShape(const SkRRect& rrect) : fType(Type::kRRect), fRRect(rrect) {}
     explicit GrShape(const SkRect& rect) : fType(Type::kRRect), fRRect(SkRRect::MakeRect(rect)) {}

[robertphillips, 2016/04/26 22:18:32]

No un-styled variants ?

[bsalomon, 2016/04/29 23:12:06]

Done.

 
+    GrShape(const SkPath& path, const GrStyle& style)
+        : fType(Type::kPath)
+        , fPath(&path)
+        , fStyle(style) {
+        this->attemptToReduceFromPath();
+    }
+
     GrShape(const SkRRect& rrect, const GrStyle& style)
         : fType(Type::kRRect)
         , fRRect(rrect)
         , fStyle(style) {}
 
     GrShape(const SkRect& rect, const GrStyle& style)
         : fType(Type::kRRect)
         , fRRect(SkRRect::MakeRect(rect))
         , fStyle(style) {}
 
+    GrShape(const SkPath& path, const SkPaint& paint)
+        : fType(Type::kPath)
+        , fPath(&path)
+        , fStyle(paint) {
+        this->attemptToReduceFromPath();
+    }
+
     GrShape(const SkRRect& rrect, const SkPaint& paint)
         : fType(Type::kRRect)
         , fRRect(rrect)
         , fStyle(paint) {}
 
     GrShape(const SkRect& rect, const SkPaint& paint)
         : fType(Type::kRRect)
         , fRRect(SkRRect::MakeRect(rect))
         , fStyle(paint) {}
 
@@ skipping 54 matching lines @@
     int unstyledKeySize() const;
 
     /**
      * Writes unstyledKeySize() bytes into the provided pointer. Assumes that there is enough
      * space allocated for the key and that unstyledKeySize() does not return a negative value
      * for this shape.
      */
     void writeUnstyledKey(uint32_t* key) const;
 
 private:
+    enum class Type {
+        kEmpty,
+        kRRect,
+        kPath,
+    };
+
     /**
      * Computes the key length for a GrStyle. The return will be negative if it cannot be turned
      * into a key.
      */
     static int StyleKeySize(const GrStyle& , bool stopAfterPE);
 
     /**
      * Writes a unique key for the style into the provided buffer. This function assumes the buffer
      * has room for at least StyleKeySize() values. It assumes that StyleKeySize() returns a
      * positive value for the style and stopAfterPE param. This is written so that the key for just
      * dash application followed by the key for the remaining SkStrokeRec is the same as the
      * key for applying dashing and SkStrokeRec all at once.
      */
     static void StyleKey(uint32_t*, const GrStyle&, bool stopAfterPE);
 
     /** Constructor used by Apply* functions */
     GrShape(const GrShape& parentShape, bool stopAfterPE);
 
     /**
      * Determines the key we should inherit from the input shape's geometry and style when
      * we are applying the style to create a new shape.
      */
     void setInheritedKey(const GrShape& parentShape, bool stopAfterPE);
 
-    enum class Type {
-        kEmpty,
-        kRRect,
-        kPath,
-    } fType;
+    void attemptToReduceFromPath() {
+        SkASSERT(Type::kPath == fType);
+        fType = AttemptToReduceFromPathImpl(*fPath.get(), &fRRect, fStyle.pathEffect(),
+                                            fStyle.strokeRec());
+        if (Type::kPath != fType) {
+            fPath.reset();
+            fInheritedKey.reset(0);
+        }
+    }
 
+    static Type AttemptToReduceFromPathImpl(const SkPath& path, SkRRect* rrect,
+                                            const SkPathEffect* pe, const SkStrokeRec& strokeRec) {
+        if (path.isEmpty()) {
+            return Type::kEmpty;
+        }
+        if (path.isRRect(rrect)) {
+            return Type::kRRect;
+        }
+        SkRect rect;
+        if (path.isOval(&rect)) {
+            rrect->setOval(rect);
+            return Type::kRRect;
+        }
+        bool closed;
+        if (path.isRect(&rect, &closed, nullptr)) {
+            if (closed || (!pe && strokeRec.isFillStyle())) {
+                rrect->setRect(rect);
+                return Type::kRRect;
+            }
+        }
+        return Type::kPath;
+    }
+
+    Type                        fType;
     SkRRect                     fRRect;
     SkTLazy<SkPath>             fPath;
     GrStyle                     fStyle;
     SkAutoSTArray<8, uint32_t>  fInheritedKey;
 };
 #endif