Add bounds to GrShape

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1970003003

Review-Url: https://codereview.chromium.org/1970003003

3 files changed, 32 insertions, 0 deletions

diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp
index 8462d4d41d..e0ddc55e02 100644
--- a/src/gpu/GrShape.cpp
+++ b/src/gpu/GrShape.cpp
@@ -37,6 +37,28 @@ GrShape& GrShape::operator=(const GrShape& that) {
     return *this;
 }
 
+const SkRect& GrShape::bounds() const {
+    static constexpr SkRect kEmpty = SkRect::MakeEmpty();
+    switch (fType) {
+        case Type::kEmpty:
+            return kEmpty;
+        case Type::kRRect:
+            return fRRect.getBounds();
+        case Type::kPath:
+            return fPath.get()->getBounds();
+    }
+    SkFAIL("Unknown shape type");
+    return kEmpty;
+}
+
+void GrShape::styledBounds(SkRect* bounds) const {
+    if (Type::kEmpty == fType && !fStyle.hasNonDashPathEffect()) {
+        *bounds = SkRect::MakeEmpty();
+    } else {
+        fStyle.adjustBounds(bounds, this->bounds());
+    }
+}
+
 int GrShape::unstyledKeySize() const {
     if (fInheritedKey.count()) {
         return fInheritedKey.count();
diff --git a/src/gpu/GrShape.h b/src/gpu/GrShape.h
index 81684e8e2f..12093f4143 100644
--- a/src/gpu/GrShape.h
+++ b/src/gpu/GrShape.h
@@ -148,6 +148,12 @@ public:
      */
     bool isEmpty() const { return Type::kEmpty == fType; }
 
+    /** Gets the bounds of the geometry without reflecting the shape's styling. */
+    const SkRect& bounds() const;
+
+    /** Gets the bounds of the geometry reflecting the shape's styling. */
+    void styledBounds(SkRect* bounds) const;
+
     /**
      * 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).
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
index 07efb40866..cbaa50d9ef 100644
--- a/src/gpu/GrStyle.h
+++ b/src/gpu/GrStyle.h
@@ -167,6 +167,10 @@ public:
     void adjustBounds(SkRect* dst, const SkRect& src) const {
         if (this->pathEffect()) {
             this->pathEffect()->computeFastBounds(dst, src);
+            // This may not be the correct SkStrokeRec to use. skbug.com/5299
+            // It happens to work for dashing.
+            SkScalar radius = fStrokeRec.getInflationRadius();
+            dst->outset(radius, radius);
         } else {
             SkScalar radius = fStrokeRec.getInflationRadius();
             *dst = src.makeOutset(radius, radius);