Stop banning stroke-and-fill for GrStyle and add tests

src/gpu/GrStyle.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 GrStyle_DEFINED
 #define GrStyle_DEFINED
 
 #include "GrTypes.h"
 #include "SkPathEffect.h"
 #include "SkStrokeRec.h"
 #include "SkTemplates.h"
 
 /**
  * Represents the various ways that a GrShape can be styled. It has fill/stroking information
  * as well as an optional path effect. If the path effect represents dashing, the dashing
  * information is extracted from the path effect and stored explicitly.
  *
- * This object does not support stroke-and-fill styling. It is expected that stroking and filling
- * is handled by drawing a stroke and a fill separately.
- *
  * This will replace GrStrokeInfo as GrShape is deployed.
  */
 class GrStyle {
 public:
     /**
      * A style object that represents a fill with no path effect.
      * TODO: constexpr with C++14
      */
     static const GrStyle& SimpleFill() {
         static const GrStyle kFill(SkStrokeRec::kFill_InitStyle);
@@ skipping 38 matching lines @@
      * 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 WriteKey(uint32_t*, const GrStyle&, Apply, uint32_t flags = 0);
 
     GrStyle() : GrStyle(SkStrokeRec::kFill_InitStyle) {}
 
     explicit GrStyle(SkStrokeRec::InitStyle initStyle) : fStrokeRec(initStyle) {}
 
     GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) {
-        SkASSERT(SkStrokeRec::kStrokeAndFill_Style != strokeRec.getStyle());
         this->initPathEffect(pe);
     }
 
     GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) { *this = that; }
 
     explicit GrStyle(const SkPaint& paint) : fStrokeRec(paint) {
-        SkASSERT(SkStrokeRec::kStrokeAndFill_Style != fStrokeRec.getStyle());
         this->initPathEffect(paint.getPathEffect());
     }
 
     GrStyle& operator=(const GrStyle& that) {
         fPathEffect = that.fPathEffect;
         fDashInfo = that.fDashInfo;
         fStrokeRec = that.fStrokeRec;
         return *this;
     }
 
@@ skipping 80 matching lines @@
         SkScalar                    fPhase;
         SkAutoSTArray<4, SkScalar>  fIntervals;
     };
 
     SkStrokeRec         fStrokeRec;
     sk_sp<SkPathEffect> fPathEffect;
     DashInfo            fDashInfo;
 };
 
 #endif