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

src/utils/SkDashPath.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDashPathPriv.h"
 #include "SkPathMeasure.h"
 #include "SkStrokeRec.h"
@@ skipping 201 matching lines @@
     SkScalar fPathLength;
 };
 
 
 bool SkDashPath::InternalFilter(SkPath* dst, const SkPath& src, SkStrokeRec* rec,
                                 const SkRect* cullRect, const SkScalar aIntervals[],
                                 int32_t count, SkScalar initialDashLength, int32_t initialDashIndex,
                                 SkScalar intervalLength) {
 
     // we do nothing if the src wants to be filled
-    if (rec->isFillStyle()) {
+    SkStrokeRec::Style style = rec->getStyle();
+    if (SkStrokeRec::kFill_Style == style || SkStrokeRec::kStrokeAndFill_Style == style) {
         return false;
     }
 
     const SkScalar* intervals = aIntervals;
     SkScalar        dashCount = 0;
     int             segCount = 0;
 
     SkPath cullPathStorage;
     const SkPath* srcPtr = &src;
     if (cull_path(src, *rec, cullRect, intervalLength, &cullPathStorage)) {
@@ skipping 100 matching lines @@
     SkScalar length = 0;
     for (int i = 0; i < count; i++) {
         if (intervals[i] < 0) {
             return false;
         }
         length += intervals[i];
     }
     // watch out for values that might make us go out of bounds
     return length > 0 && SkScalarIsFinite(phase) && SkScalarIsFinite(length);
 }