Add bounds to GrShape

src/gpu/GrShape.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrShape.h"
 
 GrShape& GrShape::operator=(const GrShape& that) {
@@ skipping 19 matching lines @@
                 fPath.set(*that.fPath.get());
             }
             break;
     }
     fInheritedKey.reset(that.fInheritedKey.count());
     sk_careful_memcpy(fInheritedKey.get(), that.fInheritedKey.get(),
                       sizeof(uint32_t) * fInheritedKey.count());
     return *this;
 }
 
+const SkRect& GrShape::bounds() {
+    static constexpr SkRect kEmpty = SkRect::MakeEmpty();
+    switch (fType) {
+        case Type::kEmpty:

[robertphillips, 2016/05/12 17:18:47]

Why not just return SkRect::MakeEmpty here ?

[bsalomon, 2016/05/12 18:37:57]

Becausethe return is a const& to a SkRect, so I can't return a temporary.

+            return kEmpty;
+        case Type::kRRect:
+            return fRRect.getBounds();
+        case Type::kPath:
+            return fPath.get()->getBounds();
+    }
+}
+
+void GrShape::styledBounds(SkRect* bounds) {
+    if (Type::kEmpty == fType && !fStyle.hasNonDashPathEffect()) {

[robertphillips, 2016/05/12 17:18:47]

Is it an empty path or a path with a single point that becomes a circle when
stroked with circular caps?

+        *bounds = SkRect::MakeEmpty();
+    } else {
+        fStyle.adjustBounds(bounds, this->bounds());
+    }
+}
+
 int GrShape::unstyledKeySize() const {
     if (fInheritedKey.count()) {
         return fInheritedKey.count();
     }
     switch (fType) {
         case Type::kEmpty:
             return 1;
         case Type::kRRect:
             SkASSERT(!fInheritedKey.count());
             SkASSERT(0 == SkRRect::kSizeInMemory % sizeof(uint32_t));
@@ skipping 176 matching lines @@
         SkStrokeRec::InitStyle fillOrHairline;
         SkASSERT(parent.fStyle.applies());
         SkASSERT(!parent.fStyle.pathEffect());
         SkAssertResult(parent.fStyle.applyToPath(fPath.get(), &fillOrHairline, *srcForParentStyle,
                                                  scale));
         fStyle.resetToInitStyle(fillOrHairline);
     }
     this->attemptToReduceFromPath();
     this->setInheritedKey(*parentForKey, apply, scale);
 }