Revert of Make lines a special case in GrShape

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 134 matching lines @@
         if (inverted) {
             *inverted = fRRectData.fInverted;
         }
         return true;
     }
 
     /**
      * If the unstyled shape is a straight line segment, returns true and sets pts to the endpoints.
      * An inverse filled line path is still considered a line.
      */
-    bool asLine(SkPoint pts[2], bool* inverted) const {
-        if (fType != Type::kLine) {
-            return false;
-        }
-        if (pts) {
-            pts[0] = fLineData.fPts[0];
-            pts[1] = fLineData.fPts[1];
-        }
-        if (inverted) {
-            *inverted = fLineData.fInverted;
-        }
-        return true;
-    }
+     bool asLine(SkPoint pts[2]) const {
+         if (fType != Type::kPath) {
+             return false;
+         }
+         return this->path().isLine(pts);
+     }
 
     /** Returns the unstyled geometry as a path. */
     void asPath(SkPath* out) const {
         switch (fType) {
             case Type::kEmpty:
                 out->reset();
                 break;
             case Type::kRRect:
                 out->reset();
                 out->addRRect(fRRectData.fRRect, fRRectData.fDir, fRRectData.fStart);
                 // Below matches the fill type that attemptToSimplifyPath uses.
                 if (fRRectData.fInverted) {
                     out->setFillType(kDefaultPathInverseFillType);
                 } else {
                     out->setFillType(kDefaultPathFillType);
                 }
                 break;
-            case Type::kLine:
-                out->reset();
-                out->moveTo(fLineData.fPts[0]);
-                out->lineTo(fLineData.fPts[1]);
-                if (fLineData.fInverted) {
-                    out->setFillType(kDefaultPathInverseFillType);
-                } else {
-                    out->setFillType(kDefaultPathFillType);
-                }
-                break;
             case Type::kPath:
                 *out = this->path();
                 break;
         }
     }
 
     /**
      * Returns whether the geometry is empty. Note that applying the style could produce a
      * non-empty shape.
      */
     bool isEmpty() const { return Type::kEmpty == fType; }
 
     /**
      * Gets the bounds of the geometry without reflecting the shape's styling. This ignores
      * the inverse fill nature of the geometry.
      */
-    SkRect bounds() const;
+    const SkRect& bounds() const;
 
     /**
      * Gets the bounds of the geometry reflecting the shape's styling (ignoring inverse fill
      * status).
      */
-    SkRect styledBounds() const;
+    void styledBounds(SkRect* bounds) const;
 
     /**
      * Is this shape known to be convex, before styling is applied. An unclosed but otherwise
      * convex path is considered to be closed if they styling reflects a fill and not otherwise.
      * This is because filling closes all contours in the path.
      */
     bool knownToBeConvex() const {
         switch (fType) {
             case Type::kEmpty:
                 return true;
             case Type::kRRect:
                 return true;
-            case Type::kLine:
-                return true;
             case Type::kPath:
                 // SkPath.isConvex() really means "is this path convex were it to be closed" and
                 // thus doesn't give the correct answer for stroked paths, hence we also check
                 // whether the path is either filled or closed. Convex paths may only have one
                 // contour hence isLastContourClosed() is a sufficient for a convex path.
                 return (this->style().isSimpleFill() || this->path().isLastContourClosed()) &&
                         this->path().isConvex();
         }
         return false;
     }
 
     /** Is the pre-styled geometry inverse filled? */
     bool inverseFilled() const {
         bool ret = false;
         switch (fType) {
             case Type::kEmpty:
                 ret = false;
                 break;
             case Type::kRRect:
                 ret = fRRectData.fInverted;
                 break;
-            case Type::kLine:
-                ret = fLineData.fInverted;
-                break;
             case Type::kPath:
                 ret = this->path().isInverseFillType();
                 break;
         }
         // Dashing ignores inverseness. We should have caught this earlier. skbug.com/5421
         SkASSERT(!(ret && this->style().isDashed()));
         return ret;
     }
 
     /**
@@ skipping 13 matching lines @@
     /**
      * Is it known that the unstyled geometry has no unclosed contours. This means that it will
      * not have any caps if stroked (modulo the effect of any path effect).
      */
     bool knownToBeClosed() const {
         switch (fType) {
             case Type::kEmpty:
                 return true;
             case Type::kRRect:
                 return true;
-            case Type::kLine:
-                return false;
             case Type::kPath:
                 // SkPath doesn't keep track of the closed status of each contour.
                 return SkPathPriv::IsClosedSingleContour(this->path());
         }
         return false;
     }
 
     uint32_t segmentMask() const {
         switch (fType) {
             case Type::kEmpty:
                 return 0;
             case Type::kRRect:
                 if (fRRectData.fRRect.getType() == SkRRect::kOval_Type) {
                     return SkPath::kConic_SegmentMask;
                 } else if (fRRectData.fRRect.getType() == SkRRect::kRect_Type) {
                     return SkPath::kLine_SegmentMask;
                 }
                 return SkPath::kLine_SegmentMask | SkPath::kConic_SegmentMask;
-            case Type::kLine:
-                return SkPath::kLine_SegmentMask;
             case Type::kPath:
                 return this->path().getSegmentMasks();
         }
         return 0;
     }
 
     /**
      * Gets the size of the key for the shape represented by this GrShape (ignoring its styling).
      * A negative value is returned if the shape has no key (shouldn't be cached).
      */
     int unstyledKeySize() const;
 
     bool hasUnstyledKey() const { return this->unstyledKeySize() >= 0; }
 
     /**
      * 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,
-        kLine,
         kPath,
     };
 
     void initType(Type type, const SkPath* path = nullptr) {
         fType = Type::kEmpty;
         this->changeType(type, path);
     }
 
     void changeType(Type type, const SkPath* path = nullptr) {
         bool wasPath = Type::kPath == fType;
@@ skipping 29 matching lines @@
     GrShape(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
 
     /**
      * 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, GrStyle::Apply, SkScalar scale);
 
     void attemptToSimplifyPath();
     void attemptToSimplifyRRect();
-    void attemptToSimplifyLine();
 
     // Defaults to use when there is no distinction between even/odd and winding fills.
     static constexpr SkPath::FillType kDefaultPathFillType = SkPath::kEvenOdd_FillType;
     static constexpr SkPath::FillType kDefaultPathInverseFillType =
             SkPath::kInverseEvenOdd_FillType;
 
     static constexpr SkPath::Direction kDefaultRRectDir = SkPath::kCW_Direction;
     static constexpr unsigned kDefaultRRectStart = 0;
 
     static unsigned DefaultRectDirAndStartIndex(const SkRect& rect, bool hasPathEffect,
@@ skipping 44 matching lines @@
             SkRRect                     fRRect;
             SkPath::Direction           fDir;
             unsigned                    fStart;
             bool                        fInverted;
         } fRRectData;
         struct {
             SkPath                      fPath;
             // Gen ID of the original path (fPath may be modified)
             int32_t                     fGenID;
         } fPathData;
-        struct {
-            SkPoint                     fPts[2];
-            bool                        fInverted;
-        } fLineData;
     };
     GrStyle                     fStyle;
     SkAutoSTArray<8, uint32_t>  fInheritedKey;
 };
 #endif