Remove style application from GrPathRenderer subclasses

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 20 matching lines @@
                 *fPath.get() = *that.fPath.get();
             } else {
                 fPath.set(*that.fPath.get());
             }
             fPathGenID = that.fPathGenID;
             break;
     }
     fInheritedKey.reset(that.fInheritedKey.count());
     sk_careful_memcpy(fInheritedKey.get(), that.fInheritedKey.get(),
                       sizeof(uint32_t) * fInheritedKey.count());
+    SkASSERT((Type::kPath == fType) == SkToBool(fPath.getMaybeNull()));

[bsalomon, 2016/06/24 20:53:33]

Ignore all these. I meant to delete these asserts.

     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();
@@ skipping 124 matching lines @@
             fRRectIsInverted = that.fRRectIsInverted;
             break;
         case Type::kPath:
             fPath.set(*that.fPath.get());
             fPathGenID = that.fPathGenID;
             break;
     }
     fInheritedKey.reset(that.fInheritedKey.count());
     sk_careful_memcpy(fInheritedKey.get(), that.fInheritedKey.get(),
                       sizeof(uint32_t) * fInheritedKey.count());
+    SkASSERT((Type::kPath == fType) == SkToBool(fPath.getMaybeNull()));
 }
 
 GrShape::GrShape(const GrShape& parent, GrStyle::Apply apply, SkScalar scale) {
     // TODO: Add some quantization of scale for better cache performance here or leave that up
     // to caller?
     // TODO: For certain shapes and stroke params we could ignore the scale. (e.g. miter or bevel
     // stroke of a rect).
     if (!parent.style().applies() ||
         (GrStyle::Apply::kPathEffectOnly == apply && !parent.style().pathEffect())) {
         fType = Type::kEmpty;
@@ skipping 66 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->attemptToSimplifyPath();
     this->setInheritedKey(*parentForKey, apply, scale);
+    SkASSERT((Type::kPath == fType) == SkToBool(fPath.getMaybeNull()));
 }
 
 void GrShape::attemptToSimplifyPath() {
     SkASSERT(Type::kPath == fType);
     SkRect rect;
     if (fPath.get()->isEmpty()) {
         fType = Type::kEmpty;
     } else if (fPath.get()->isRRect(&fRRect, &fRRectDir, &fRRectStart)) {
         // Currently SkPath does not acknowledge that empty, rect, or oval subtypes as rrects.
         SkASSERT(!fRRect.isEmpty());
@@ skipping 83 matching lines @@
         return;
     }
     if (!this->style().hasPathEffect()) {
         fRRectDir = kDefaultRRectDir;
         fRRectStart = kDefaultRRectStart;
     } else if (fStyle.isDashed()) {
         // Dashing ignores the inverseness (currently). skbug.com/5421
         fRRectIsInverted = false;
     }
 }