Make SkDashPathEffect fail for stroke+fill style (in addition to fill style)

src/gpu/GrStyle.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 "GrStyle.h"
 
 int GrStyle::KeySize(const GrStyle &style, Apply apply, uint32_t flags) {
@@ skipping 88 matching lines @@
 
 void GrStyle::initPathEffect(SkPathEffect* pe) {
     SkASSERT(!fPathEffect)
     SkASSERT(SkPathEffect::kNone_DashType == fDashInfo.fType);
     SkASSERT(0 == fDashInfo.fIntervals.count());
     if (!pe) {
         return;
     }
     SkPathEffect::DashInfo info;
     if (SkPathEffect::kDash_DashType == pe->asADash(&info)) {
-        if (fStrokeRec.getStyle() != SkStrokeRec::kFill_Style) {
+        SkStrokeRec::Style recStyle = fStrokeRec.getStyle();
+        if (recStyle != SkStrokeRec::kFill_Style && recStyle != SkStrokeRec::kStrokeAndFill_Style) {
             fDashInfo.fType = SkPathEffect::kDash_DashType;
             fDashInfo.fIntervals.reset(info.fCount);
             fDashInfo.fPhase = info.fPhase;
             info.fIntervals = fDashInfo.fIntervals.get();
             pe->asADash(&info);
             fPathEffect.reset(SkSafeRef(pe));
         }
     } else {
         fPathEffect.reset(SkSafeRef(pe));
     }
@@ skipping 45 matching lines @@
         return false;
     } else {
         SkASSERT(SkStrokeRec::kFill_Style == strokeRec.getStyle() ||
                  SkStrokeRec::kHairline_Style == strokeRec.getStyle());
         *style = strokeRec.getStyle() == SkStrokeRec::kFill_Style
                  ? SkStrokeRec::kFill_InitStyle
                  : SkStrokeRec::kHairline_InitStyle;
     }
     return true;
 }