commit 398e3f4b9f67e0c7f635e68cae1ff7f42213bbfc
author bsalomon <bsalomon@google.com> Mon Jun 13 10:22:48 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 13 10:22:48 2016 -0700
tree ed4f532937b72b00c9521aa90980033d041a1f2c
parent 2ec06c9b1c861d456b85ffe48b27e4dcae4800cb

Add control over whether lines are special cased in SkDashPath. Disable when called from GrShape.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055253002

Review-Url: https://codereview.chromium.org/2055253002

src/gpu/GrShape.cpp

diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp
index d2bec72..11b2d38 100644
--- a/src/gpu/GrShape.cpp
+++ b/src/gpu/GrShape.cpp
@@ -211,8 +211,8 @@
         // Should we consider bounds? Would have to include in key, but it'd be nice to know
         // if the bounds actually modified anything before including in key.
         SkStrokeRec strokeRec = parent.fStyle.strokeRec();
-        strokeRec.setResScale(scale);
-        if (!pe->filterPath(fPath.get(), *srcForPathEffect, &strokeRec, nullptr)) {
+        if (!parent.fStyle.applyPathEffectToPath(fPath.get(), &strokeRec, *srcForPathEffect,
+                                                 scale)) {
             // If the path effect fails then we continue as though there was no path effect.
             // If the original was a rrect that we couldn't canonicalize because of the path
             // effect, then do so now.

src/gpu/GrShape.h

diff --git a/src/gpu/GrShape.h b/src/gpu/GrShape.h
index 3efb66f..93896ce 100644
--- a/src/gpu/GrShape.h
+++ b/src/gpu/GrShape.h
@@ -168,6 +168,17 @@
         return true;
     }
 
+    /**
+     * If the unstyled shape is a straight line segment, returns true and sets pts to the endpoints.
+     * An inverse filled line path is still considered a line.
+     */
+     bool asLine(SkPoint pts[2]) const {
+         if (fType != Type::kPath) {
+             return false;
+         }
+         return fPath.get()->isLine(pts);
+     }
+
     /** Returns the unstyled geometry as a path. */
     void asPath(SkPath* out) const {
         switch (fType) {

src/gpu/GrStyle.cpp

diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp
index bb1f03d..10a0deb 100644
--- a/src/gpu/GrStyle.cpp
+++ b/src/gpu/GrStyle.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "GrStyle.h"
+#include "SkDashPathPriv.h"
 
 int GrStyle::KeySize(const GrStyle &style, Apply apply, uint32_t flags) {
     GR_STATIC_ASSERT(sizeof(uint32_t) == sizeof(SkScalar));
@@ -120,12 +121,29 @@
     }
 }
 
-static inline bool apply_path_effect(SkPath* dst, SkStrokeRec* strokeRec,
-                                     const sk_sp<SkPathEffect>& pe, const SkPath& src) {
-    if (!pe) {
+bool GrStyle::applyPathEffect(SkPath* dst, SkStrokeRec* strokeRec, const SkPath& src) const {
+    if (!fPathEffect) {
         return false;
     }
-    if (!pe->filterPath(dst, src, strokeRec, nullptr)) {
+    if (SkPathEffect::kDash_DashType == fDashInfo.fType) {
+        // We apply the dash ourselves here rather than using the path effect. This is so that
+        // we can control whether the dasher applies the strokeRec for special cases. Our keying
+        // depends on the strokeRec being applied separately.
+        SkScalar phase = fDashInfo.fPhase;
+        const SkScalar* intervals = fDashInfo.fIntervals.get();
+        int intervalCnt = fDashInfo.fIntervals.count();
+        SkScalar initialLength;
+        int initialIndex;
+        SkScalar intervalLength;
+        SkDashPath::CalcDashParameters(phase, intervals, intervalCnt, &initialLength,
+                                       &initialIndex, &intervalLength);
+        if (!SkDashPath::InternalFilter(dst, src, strokeRec,
+                                        nullptr, intervals, intervalCnt,
+                                        initialLength, initialIndex, intervalLength,
+                                        SkDashPath::StrokeRecApplication::kDisallow)) {
+            return false;
+        }
+    } else if (!fPathEffect->filterPath(dst, src, strokeRec, nullptr)) {
         return false;
     }
     dst->setIsVolatile(true);
@@ -137,7 +155,7 @@
     SkASSERT(dst);
     SkStrokeRec strokeRec = fStrokeRec;
     strokeRec.setResScale(resScale);
-    if (!apply_path_effect(dst, &strokeRec, fPathEffect, src)) {
+    if (!this->applyPathEffect(dst, &strokeRec, src)) {
         return false;
     }
     *remainingStroke = strokeRec;
@@ -151,7 +169,7 @@
     SkStrokeRec strokeRec = fStrokeRec;
     strokeRec.setResScale(resScale);
     const SkPath* pathForStrokeRec = &src;
-    if (apply_path_effect(dst, &strokeRec, fPathEffect, src)) {
+    if (this->applyPathEffect(dst, &strokeRec, src)) {
         pathForStrokeRec = dst;
     } else if (fPathEffect) {
         return false;

src/gpu/GrStyle.h

diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
index 5190834..326f800 100644
--- a/src/gpu/GrStyle.h
+++ b/src/gpu/GrStyle.h
@@ -201,6 +201,8 @@
         SkAutoSTArray<4, SkScalar>  fIntervals;
     };
 
+    bool applyPathEffect(SkPath* dst, SkStrokeRec* strokeRec, const SkPath& src) const;
+
     SkStrokeRec         fStrokeRec;
     sk_sp<SkPathEffect> fPathEffect;
     DashInfo            fDashInfo;