add conics to path ops

Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall.

Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops.

TBR=reed
BUG=skia:3588
Committed: https://skia.googlesource.com/skia/+/1049f1246e7be4ccb68001361efceb8933e6f81c

[caryclark, 2015-04-09 12:02:36]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-09 12:02:51]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/130001

[commit-bot: I haz the power, 2015-04-09 12:10:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-09 12:10:16]

This issue passed the CQ dry run.

[caryclark, 2015-04-09 17:33:57]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-09 17:34:19]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/150001

[commit-bot: I haz the power, 2015-04-09 17:36:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-09 17:36:12]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Ubuntu-Clang-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)

[caryclark, 2015-04-09 17:40:14]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-09 17:40:42]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/160001

[commit-bot: I haz the power, 2015-04-09 17:42:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-09 17:42:57]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[caryclark, 2015-04-10 21:08:19]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-10 21:08:42]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/170001

[commit-bot: I haz the power, 2015-04-10 21:24:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-10 21:24:43]

Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)

[caryclark, 2015-04-13 21:21:58]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-13 21:22:18]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/190001

[commit-bot: I haz the power, 2015-04-13 21:22:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-13 21:22:38]

Failed to apply patch for src/pathops/SkPathOpsTSect2.h:
While running git apply --index -3 -p1;
  error: patch failed: src/pathops/SkPathOpsTSect.h:13
  Falling back to three-way merge...
  Applied patch to 'src/pathops/SkPathOpsTSect2.h' with conflicts.
  U src/pathops/SkPathOpsTSect2.h

Patch:   NR  src/pathops/SkPathOpsTSect.h->src/pathops/SkPathOpsTSect2.h
Index: src/pathops/SkPathOpsTSect2.h
diff --git a/src/pathops/SkPathOpsTSect.h b/src/pathops/SkPathOpsTSect2.h
similarity index 67%
copy from src/pathops/SkPathOpsTSect.h
copy to src/pathops/SkPathOpsTSect2.h
index
ae01a1dcbabbe09b06158c65bf577af38cbff8a6..ddeef3917f0d8e4b68c93a4ae52033b1beefdc1f
100644
--- a/src/pathops/SkPathOpsTSect.h
+++ b/src/pathops/SkPathOpsTSect2.h
@@ -13,11 +13,11 @@
 #include "SkTSort.h"
 
 /* TCurve is either SkDQuadratic or SkDCubic */
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 class SkTCoincident {
 public:
-    SkTCoincident()
-        : fCoincident(false) {
+    SkTCoincident() {
+        this->clear();
     }
 
     void clear() {
@@ -30,9 +30,8 @@ public:
     }
 
     void init() {
-        fCoincident = false;
+        this->clear();
         SkDEBUGCODE(fPerpPt.fX = fPerpPt.fY = SK_ScalarNaN);
-        SkDEBUGCODE(fPerpT = SK_ScalarNaN);
     }
 
     void markCoincident() {
@@ -50,7 +49,7 @@ public:
         return fPerpT;
     }
 
-    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const TCurve&
);
+    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const
OppCurve& );
 
 private:
     SkDPoint fPerpPt;
@@ -58,28 +57,28 @@ private:
     bool fCoincident;
 };
 
-template<typename TCurve> class SkTSect;
-template<typename TCurve> class SkTSpan;
+template<typename TCurve, typename OppCurve> class SkTSect2;
+template<typename TCurve, typename OppCurve> class SkTSpan2;
 
-template<typename TCurve>
-struct SkTSpanBounded {
-    SkTSpan<TCurve>* fBounded;
-    SkTSpanBounded* fNext;
+template<typename TCurve, typename OppCurve>
+struct SkTSpan2Bounded {
+    SkTSpan2<TCurve, OppCurve>* fBounded;
+    SkTSpan2Bounded* fNext;
 };
 
 /* Curve is either TCurve or SkDCubic */
-template<typename TCurve>
-class SkTSpan {
+template<typename TCurve, typename OppCurve>
+class SkTSpan2 {
 public:
-    void addBounded(SkTSpan* , SkChunkAlloc* );
+    void addBounded(SkTSpan2<OppCurve, TCurve>* , SkChunkAlloc* );
     double closestBoundedT(const SkDPoint& pt) const;
     bool contains(double t) const;
 
-    const SkTSect<TCurve>* debugOpp() const;
-    const SkTSpan* debugSpan(int ) const;
-    const SkTSpan* debugT(double t) const;
+    const SkTSect2<OppCurve, TCurve>* debugOpp() const;
+    const SkTSpan2* debugSpan(int ) const;
+    const SkTSpan2* debugT(double t) const;
 #ifdef SK_DEBUG
-    bool debugIsBefore(const SkTSpan* span) const;
+    bool debugIsBefore(const SkTSpan2* span) const;
 #endif
     void dump() const;
     void dumpBounds(int id) const;
@@ -88,10 +87,10 @@ public:
         return fEndT;
     }
 
-    SkTSpan* findOppSpan(const SkTSpan* opp) const;
+    SkTSpan2<OppCurve, TCurve>* findOppSpan(const SkTSpan2<OppCurve, TCurve>*
opp) const;
 
-    SkTSpan* findOppT(double t) const {
-        SkTSpan* result = oppT(t);
+    SkTSpan2<OppCurve, TCurve>* findOppT(double t) const {
+        SkTSpan2<OppCurve, TCurve>* result = oppT(t);
         SkASSERT(result);
         return result;
     }
@@ -100,7 +99,7 @@ public:
         return SkToBool(oppT(t));
     }
 
-    int hullsIntersect(SkTSpan* span, bool* start, bool* oppStart);
+    int hullsIntersect(SkTSpan2<OppCurve, TCurve>* span, bool* start, bool*
oppStart);
     void init(const TCurve& );
     void initBounds(const TCurve& );
 
@@ -108,7 +107,7 @@ public:
         return fBounded != NULL;
     }
 
-    bool linearsIntersect(SkTSpan* span);
+    bool linearsIntersect(SkTSpan2<OppCurve, TCurve>* span);
     double linearT(const SkDPoint& ) const;
 
     void markCoincident() {
@@ -116,18 +115,19 @@ public:
         fCoinEnd.markCoincident();
     }
 
-    const SkTSpan* next() const {
+    const SkTSpan2* next() const {
         return fNext;
     }
 
-    bool onlyEndPointsInCommon(const SkTSpan* opp, bool* start, bool* oppStart,
bool* ptsInCommon);
+    bool onlyEndPointsInCommon(const SkTSpan2<OppCurve, TCurve>* opp, bool*
start,
+            bool* oppStart, bool* ptsInCommon);
 
     const TCurve& part() const {
         return fPart;
     }
 
     bool removeAllBounded();
-    bool removeBounded(const SkTSpan* opp);
+    bool removeBounded(const SkTSpan2<OppCurve, TCurve>* opp);
 
     void reset() {
         fBounded = NULL;
@@ -138,11 +138,11 @@ public:
         initBounds(curve);
     }
 
-    bool split(SkTSpan* work, SkChunkAlloc* heap) {
+    bool split(SkTSpan2* work, SkChunkAlloc* heap) {
         return splitAt(work, (work->fStartT + work->fEndT) * 0.5, heap);
     }
 
-    bool splitAt(SkTSpan* work, double t, SkChunkAlloc* heap);
+    bool splitAt(SkTSpan2* work, double t, SkChunkAlloc* heap);
 
     double startT() const {
         return fStartT;
@@ -157,9 +157,9 @@ private:
 
     void dumpID() const;
 
-    int hullCheck(const SkTSpan* opp, bool* start, bool* oppStart);
-    int linearIntersects(const TCurve& ) const;
-    SkTSpan* oppT(double t) const;
+    int hullCheck(const SkTSpan2<OppCurve, TCurve>* opp, bool* start, bool*
oppStart);
+    int linearIntersects(const OppCurve& ) const;
+    SkTSpan2<OppCurve, TCurve>* oppT(double t) const;
 
     void validate() const;
     void validateBounded() const;
@@ -167,11 +167,11 @@ private:
     void validatePerpPt(double t, const SkDPoint& ) const;
 
     TCurve fPart;
-    SkTCoincident<TCurve> fCoinStart;
-    SkTCoincident<TCurve> fCoinEnd;
-    SkTSpanBounded<TCurve>* fBounded;
-    SkTSpan* fPrev;
-    SkTSpan* fNext;
+    SkTCoincident<TCurve, OppCurve> fCoinStart;
+    SkTCoincident<TCurve, OppCurve> fCoinEnd;
+    SkTSpan2Bounded<OppCurve, TCurve>* fBounded;
+    SkTSpan2* fPrev;
+    SkTSpan2* fNext;
     SkDRect fBounds;
     double fStartT;
     double fEndT;
@@ -181,28 +181,31 @@ private:
     bool fIsLinear;
     bool fIsLine;
     bool fDeleted;
-    PATH_OPS_DEBUG_CODE(SkTSect<TCurve>* fDebugSect);
+    SkDEBUGCODE_(SkTSect2<TCurve, OppCurve>* fDebugSect);
     PATH_OPS_DEBUG_T_SECT_CODE(int fID);
-    friend class SkTSect<TCurve>;
+    friend class SkTSect2<TCurve, OppCurve>;
+    friend class SkTSect2<OppCurve, TCurve>;
+    friend class SkTSpan2<OppCurve, TCurve>;
 };
 
-template<typename TCurve>
-class SkTSect {
+template<typename TCurve, typename OppCurve>
+class SkTSect2 {
 public:
-    SkTSect(const TCurve& c  PATH_OPS_DEBUG_T_SECT_PARAMS(int id));
-    static void BinarySearch(SkTSect* sect1, SkTSect* sect2, SkIntersections*
intersections);
+    SkTSect2(const TCurve& c  PATH_OPS_DEBUG_T_SECT_PARAMS(int id));
+    static void BinarySearch(SkTSect2* sect1, SkTSect2<OppCurve, TCurve>*
sect2,
+            SkIntersections* intersections);
 
     // for testing only
-    bool debugHasBounded(const SkTSpan<TCurve>* ) const;
+    bool debugHasBounded(const SkTSpan2<OppCurve, TCurve>* ) const;
 
-    const SkTSect* debugOpp() const {
-        return PATH_OPS_DEBUG_RELEASE(fOppSect, NULL);
+    const SkTSect2<OppCurve, TCurve>* debugOpp() const {
+        return SkDEBUGRELEASE(fOppSect, NULL);
     }
 
-    const SkTSpan<TCurve>* debugSpan(int id) const;
-    const SkTSpan<TCurve>* debugT(double t) const;
+    const SkTSpan2<TCurve, OppCurve>* debugSpan(int id) const;
+    const SkTSpan2<TCurve, OppCurve>* debugT(double t) const;
     void dump() const;
-    void dumpBoth(SkTSect* ) const;
+    void dumpBoth(SkTSect2<OppCurve, TCurve>* ) const;
     void dumpBounds(int id) const;
     void dumpCoin() const;
     void dumpCoinCurves() const;
@@ -216,82 +219,91 @@ private:
         kOneS2Set = 8
     };
 
-    SkTSpan<TCurve>* addFollowing(SkTSpan<TCurve>* prior);
-    void addForPerp(SkTSpan<TCurve>* span, double t);
-    SkTSpan<TCurve>* addOne();
+    SkTSpan2<TCurve, OppCurve>* addFollowing(SkTSpan2<TCurve, OppCurve>*
prior);
+    void addForPerp(SkTSpan2<OppCurve, TCurve>* span, double t);
+    SkTSpan2<TCurve, OppCurve>* addOne();
     
-    SkTSpan<TCurve>* addSplitAt(SkTSpan<TCurve>* span, double t) {
-        SkTSpan<TCurve>* result = this->addOne();
+    SkTSpan2<TCurve, OppCurve>* addSplitAt(SkTSpan2<TCurve, OppCurve>* span,
double t) {
+        SkTSpan2<TCurve, OppCurve>* result = this->addOne();
         result->splitAt(span, t, &fHeap);
         result->initBounds(fCurve);
         span->initBounds(fCurve);
         return result;
     }
 
-    bool binarySearchCoin(SkTSect* , double tStart, double tStep, double* t,
double* oppT);
-    SkTSpan<TCurve>* boundsMax() const;
-    void coincidentCheck(SkTSect* sect2);
+    bool binarySearchCoin(SkTSect2<OppCurve, TCurve>* , double tStart, double
tStep, double* t,
+                          double* oppT);
+    SkTSpan2<TCurve, OppCurve>* boundsMax() const;
+    void coincidentCheck(SkTSect2<OppCurve, TCurve>* sect2);
     bool coincidentHasT(double t);
-    void computePerpendiculars(SkTSect* sect2, SkTSpan<TCurve>* first,
SkTSpan<TCurve>* last);
-    int countConsecutiveSpans(SkTSpan<TCurve>* first, SkTSpan<TCurve>** last)
const;
+    void computePerpendiculars(SkTSect2<OppCurve, TCurve>* sect2,
SkTSpan2<TCurve, OppCurve>* first,
+                               SkTSpan2<TCurve, OppCurve>* last);
+    int countConsecutiveSpans(SkTSpan2<TCurve, OppCurve>* first,
+                              SkTSpan2<TCurve, OppCurve>** last) const;
 
     int debugID() const {
         return PATH_OPS_DEBUG_T_SECT_RELEASE(fID, -1);
     }
 
     void deleteEmptySpans();
-    void dumpCommon(const SkTSpan<TCurve>* ) const;
-    void dumpCommonCurves(const SkTSpan<TCurve>* ) const;
-    static int EndsEqual(const SkTSect* sect1, const SkTSect* sect2,
SkIntersections* );
-    SkTSpan<TCurve>* extractCoincident(SkTSect* sect2, SkTSpan<TCurve>* first,
-         …
(message too large)

[caryclark, 2015-04-14 13:55:42]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-14 13:55:50]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/200001

[commit-bot: I haz the power, 2015-04-14 13:56:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-14 13:56:08]

Failed to apply patch for src/pathops/SkPathOpsTSect.h:
While running git apply --index -3 -p1;
  error: patch failed: src/pathops/SkPathOpsTSect.h:8
  Falling back to three-way merge...
  Applied patch to 'src/pathops/SkPathOpsTSect.h' with conflicts.
  U src/pathops/SkPathOpsTSect.h

Patch:       src/pathops/SkPathOpsTSect.h
Index: src/pathops/SkPathOpsTSect.h
diff --git a/src/pathops/SkPathOpsTSect.h b/src/pathops/SkPathOpsTSect.h
index
ae01a1dcbabbe09b06158c65bf577af38cbff8a6..524c033bb5de0b3ee3d97c561eb233a6e59d1e88
100644
--- a/src/pathops/SkPathOpsTSect.h
+++ b/src/pathops/SkPathOpsTSect.h
@@ -8,16 +8,15 @@
 #include "SkChunkAlloc.h"
 #include "SkPathOpsBounds.h"
 #include "SkPathOpsRect.h"
-#include "SkPathOpsQuad.h"
 #include "SkIntersections.h"
 #include "SkTSort.h"
 
-/* TCurve is either SkDQuadratic or SkDCubic */
-template<typename TCurve>
+/* TCurve and OppCurve are one of { SkDQuadratic, SkDConic, SkDCubic } */
+template<typename TCurve, typename OppCurve>
 class SkTCoincident {
 public:
-    SkTCoincident()
-        : fCoincident(false) {
+    SkTCoincident() {
+        this->clear();
     }
 
     void clear() {
@@ -30,9 +29,8 @@ public:
     }
 
     void init() {
-        fCoincident = false;
+        this->clear();
         SkDEBUGCODE(fPerpPt.fX = fPerpPt.fY = SK_ScalarNaN);
-        SkDEBUGCODE(fPerpT = SK_ScalarNaN);
     }
 
     void markCoincident() {
@@ -50,7 +48,7 @@ public:
         return fPerpT;
     }
 
-    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const TCurve&
);
+    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const
OppCurve& );
 
 private:
     SkDPoint fPerpPt;
@@ -58,24 +56,24 @@ private:
     bool fCoincident;
 };
 
-template<typename TCurve> class SkTSect;
-template<typename TCurve> class SkTSpan;
+template<typename TCurve, typename OppCurve> class SkTSect;
+template<typename TCurve, typename OppCurve> class SkTSpan;
 
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 struct SkTSpanBounded {
-    SkTSpan<TCurve>* fBounded;
+    SkTSpan<TCurve, OppCurve>* fBounded;
     SkTSpanBounded* fNext;
 };
 
 /* Curve is either TCurve or SkDCubic */
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 class SkTSpan {
 public:
-    void addBounded(SkTSpan* , SkChunkAlloc* );
+    void addBounded(SkTSpan<OppCurve, TCurve>* , SkChunkAlloc* );
     double closestBoundedT(const SkDPoint& pt) const;
     bool contains(double t) const;
 
-    const SkTSect<TCurve>* debugOpp() const;
+    const SkTSect<OppCurve, TCurve>* debugOpp() const;
     const SkTSpan* debugSpan(int ) const;
     const SkTSpan* debugT(double t) const;
 #ifdef SK_DEBUG
@@ -88,10 +86,10 @@ public:
         return fEndT;
     }
 
-    SkTSpan* findOppSpan(const SkTSpan* opp) const;
+    SkTSpan<OppCurve, TCurve>* findOppSpan(const SkTSpan<OppCurve, TCurve>*
opp) const;
 
-    SkTSpan* findOppT(double t) const {
-        SkTSpan* result = oppT(t);
+    SkTSpan<OppCurve, TCurve>* findOppT(double t) const {
+        SkTSpan<OppCurve, TCurve>* result = oppT(t);
         SkASSERT(result);
         return result;
     }
@@ -100,7 +98,7 @@ public:
         return SkToBool(oppT(t));
     }
 
-    int hullsIntersect(SkTSpan* span, bool* start, bool* oppStart);
+    int hullsIntersect(SkTSpan<OppCurve, TCurve>* span, bool* start, bool*
oppStart);
     void init(const TCurve& );
     void initBounds(const TCurve& );
 
@@ -108,7 +106,7 @@ public:
         return fBounded != NULL;
     }
 
-    bool linearsIntersect(SkTSpan* span);
+    bool linearsIntersect(SkTSpan<OppCurve, TCurve>* span);
     double linearT(const SkDPoint& ) const;
 
     void markCoincident() {
@@ -120,14 +118,15 @@ public:
         return fNext;
     }
 
-    bool onlyEndPointsInCommon(const SkTSpan* opp, bool* start, bool* oppStart,
bool* ptsInCommon);
+    bool onlyEndPointsInCommon(const SkTSpan<OppCurve, TCurve>* opp, bool*
start,
+            bool* oppStart, bool* ptsInCommon);
 
     const TCurve& part() const {
         return fPart;
     }
 
     bool removeAllBounded();
-    bool removeBounded(const SkTSpan* opp);
+    bool removeBounded(const SkTSpan<OppCurve, TCurve>* opp);
 
     void reset() {
         fBounded = NULL;
@@ -157,9 +156,9 @@ private:
 
     void dumpID() const;
 
-    int hullCheck(const SkTSpan* opp, bool* start, bool* oppStart);
-    int linearIntersects(const TCurve& ) const;
-    SkTSpan* oppT(double t) const;
+    int hullCheck(const SkTSpan<OppCurve, TCurve>* opp, bool* start, bool*
oppStart);
+    int linearIntersects(const OppCurve& ) const;
+    SkTSpan<OppCurve, TCurve>* oppT(double t) const;
 
     void validate() const;
     void validateBounded() const;
@@ -167,9 +166,9 @@ private:
     void validatePerpPt(double t, const SkDPoint& ) const;
 
     TCurve fPart;
-    SkTCoincident<TCurve> fCoinStart;
-    SkTCoincident<TCurve> fCoinEnd;
-    SkTSpanBounded<TCurve>* fBounded;
+    SkTCoincident<TCurve, OppCurve> fCoinStart;
+    SkTCoincident<TCurve, OppCurve> fCoinEnd;
+    SkTSpanBounded<OppCurve, TCurve>* fBounded;
     SkTSpan* fPrev;
     SkTSpan* fNext;
     SkDRect fBounds;
@@ -181,28 +180,31 @@ private:
     bool fIsLinear;
     bool fIsLine;
     bool fDeleted;
-    PATH_OPS_DEBUG_CODE(SkTSect<TCurve>* fDebugSect);
+    SkDEBUGCODE_(SkTSect<TCurve, OppCurve>* fDebugSect);
     PATH_OPS_DEBUG_T_SECT_CODE(int fID);
-    friend class SkTSect<TCurve>;
+    friend class SkTSect<TCurve, OppCurve>;
+    friend class SkTSect<OppCurve, TCurve>;
+    friend class SkTSpan<OppCurve, TCurve>;
 };
 
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 class SkTSect {
 public:
     SkTSect(const TCurve& c  PATH_OPS_DEBUG_T_SECT_PARAMS(int id));
-    static void BinarySearch(SkTSect* sect1, SkTSect* sect2, SkIntersections*
intersections);
+    static void BinarySearch(SkTSect* sect1, SkTSect<OppCurve, TCurve>* sect2,
+            SkIntersections* intersections);
 
     // for testing only
-    bool debugHasBounded(const SkTSpan<TCurve>* ) const;
+    bool debugHasBounded(const SkTSpan<OppCurve, TCurve>* ) const;
 
-    const SkTSect* debugOpp() const {
-        return PATH_OPS_DEBUG_RELEASE(fOppSect, NULL);
+    const SkTSect<OppCurve, TCurve>* debugOpp() const {
+        return SkDEBUGRELEASE(fOppSect, NULL);
     }
 
-    const SkTSpan<TCurve>* debugSpan(int id) const;
-    const SkTSpan<TCurve>* debugT(double t) const;
+    const SkTSpan<TCurve, OppCurve>* debugSpan(int id) const;
+    const SkTSpan<TCurve, OppCurve>* debugT(double t) const;
     void dump() const;
-    void dumpBoth(SkTSect* ) const;
+    void dumpBoth(SkTSect<OppCurve, TCurve>* ) const;
     void dumpBounds(int id) const;
     void dumpCoin() const;
     void dumpCoinCurves() const;
@@ -216,82 +218,91 @@ private:
         kOneS2Set = 8
     };
 
-    SkTSpan<TCurve>* addFollowing(SkTSpan<TCurve>* prior);
-    void addForPerp(SkTSpan<TCurve>* span, double t);
-    SkTSpan<TCurve>* addOne();
+    SkTSpan<TCurve, OppCurve>* addFollowing(SkTSpan<TCurve, OppCurve>* prior);
+    void addForPerp(SkTSpan<OppCurve, TCurve>* span, double t);
+    SkTSpan<TCurve, OppCurve>* addOne();
     
-    SkTSpan<TCurve>* addSplitAt(SkTSpan<TCurve>* span, double t) {
-        SkTSpan<TCurve>* result = this->addOne();
+    SkTSpan<TCurve, OppCurve>* addSplitAt(SkTSpan<TCurve, OppCurve>* span,
double t) {
+        SkTSpan<TCurve, OppCurve>* result = this->addOne();
         result->splitAt(span, t, &fHeap);
         result->initBounds(fCurve);
         span->initBounds(fCurve);
         return result;
     }
 
-    bool binarySearchCoin(SkTSect* , double tStart, double tStep, double* t,
double* oppT);
-    SkTSpan<TCurve>* boundsMax() const;
-    void coincidentCheck(SkTSect* sect2);
+    bool binarySearchCoin(SkTSect<OppCurve, TCurve>* , double tStart, double
tStep, double* t,
+                          double* oppT);
+    SkTSpan<TCurve, OppCurve>* boundsMax() const;
+    void coincidentCheck(SkTSect<OppCurve, TCurve>* sect2);
     bool coincidentHasT(double t);
-    void computePerpendiculars(SkTSect* sect2, SkTSpan<TCurve>* first,
SkTSpan<TCurve>* last);
-    int countConsecutiveSpans(SkTSpan<TCurve>* first, SkTSpan<TCurve>** last)
const;
+    void computePerpendiculars(SkTSect<OppCurve, TCurve>* sect2,
SkTSpan<TCurve, OppCurve>* first,
+                               SkTSpan<TCurve, OppCurve>* last);
+    int countConsecutiveSpans(SkTSpan<TCurve, OppCurve>* first,
+                              SkTSpan<TCurve, OppCurve>** last) const;
 
     int debugID() const {
         return PATH_OPS_DEBUG_T_SECT_RELEASE(fID, -1);
     }
 
     void deleteEmptySpans();
-    void dumpCommon(const SkTSpan<TCurve>* ) const;
-    void dumpCommonCurves(const SkTSpan<TCurve>* ) const;
-    static int EndsEqual(const SkTSect* sect1, const SkTSect* sect2,
SkIntersections* );
-    SkTSpan<TCurve>* extractCoincident(SkTSect* sect2, SkTSpan<TCurve>* first,
-                                       SkTSpan<TCurve>* last);
-    SkTSpan<TCurve>* findCoincidentRun(SkTSpan<TCurve>* first,
SkTSpan<TCurve>** lastPtr,
-                                       const SkTSect* sect2);
-    int intersects(SkTSpan<TCurve>* span, const SkTSect* opp,
-                   SkTSpan<TCurve>* oppSpan, int* oppResult) const;
-    int linesIntersect(const SkTSpan<TCurve>* span, const SkTSect* opp,
-                       const SkTSpan<TCurve>* oppSpan, SkIntersections* )
const;
-    void markSpanGone(SkTSpan<TCurve>* span);
-    bool matchedDirection(double t, const SkTSect* sect2, double t2) const;
-    void matchedDirCheck(double t, const SkTSect* sect2, double t2,
+    void dumpCommon(const SkTSpan<TCurve, OppCurve>* ) const;
+    void dumpCommonCurves(const SkTSpan<TCurve, OppCurve>* ) const;
+    static int EndsEqual(const SkTSect* sect1, const SkTSect<OppCurve, TCurve>*
sect2,
+                         SkIntersections* );
+    SkTSpan<TCurve, OppCurve>* extractCoincident(SkTSect<OppCurve, TCurve>…
(message too large)

[caryclark, 2015-04-15 14:13:33]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-15 14:13:44]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/210001

[commit-bot: I haz the power, 2015-04-15 14:14:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-15 14:14:05]

Failed to apply patch for src/pathops/SkPathOpsTSect.h:
While running git apply --index -3 -p1;
  error: patch failed: src/pathops/SkPathOpsTSect.h:8
  Falling back to three-way merge...
  Applied patch to 'src/pathops/SkPathOpsTSect.h' with conflicts.
  U src/pathops/SkPathOpsTSect.h

Patch:       src/pathops/SkPathOpsTSect.h
Index: src/pathops/SkPathOpsTSect.h
diff --git a/src/pathops/SkPathOpsTSect.h b/src/pathops/SkPathOpsTSect.h
index
ae01a1dcbabbe09b06158c65bf577af38cbff8a6..44b70002ad8a70c3b6887fd93c6ed77d49f677d0
100644
--- a/src/pathops/SkPathOpsTSect.h
+++ b/src/pathops/SkPathOpsTSect.h
@@ -8,16 +8,15 @@
 #include "SkChunkAlloc.h"
 #include "SkPathOpsBounds.h"
 #include "SkPathOpsRect.h"
-#include "SkPathOpsQuad.h"
 #include "SkIntersections.h"
 #include "SkTSort.h"
 
-/* TCurve is either SkDQuadratic or SkDCubic */
-template<typename TCurve>
+/* TCurve and OppCurve are one of { SkDQuadratic, SkDConic, SkDCubic } */
+template<typename TCurve, typename OppCurve>
 class SkTCoincident {
 public:
-    SkTCoincident()
-        : fCoincident(false) {
+    SkTCoincident() {
+        this->clear();
     }
 
     void clear() {
@@ -30,9 +29,8 @@ public:
     }
 
     void init() {
-        fCoincident = false;
+        this->clear();
         SkDEBUGCODE(fPerpPt.fX = fPerpPt.fY = SK_ScalarNaN);
-        SkDEBUGCODE(fPerpT = SK_ScalarNaN);
     }
 
     void markCoincident() {
@@ -50,7 +48,7 @@ public:
         return fPerpT;
     }
 
-    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const TCurve&
);
+    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const
OppCurve& );
 
 private:
     SkDPoint fPerpPt;
@@ -58,24 +56,24 @@ private:
     bool fCoincident;
 };
 
-template<typename TCurve> class SkTSect;
-template<typename TCurve> class SkTSpan;
+template<typename TCurve, typename OppCurve> class SkTSect;
+template<typename TCurve, typename OppCurve> class SkTSpan;
 
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 struct SkTSpanBounded {
-    SkTSpan<TCurve>* fBounded;
+    SkTSpan<TCurve, OppCurve>* fBounded;
     SkTSpanBounded* fNext;
 };
 
 /* Curve is either TCurve or SkDCubic */
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 class SkTSpan {
 public:
-    void addBounded(SkTSpan* , SkChunkAlloc* );
+    void addBounded(SkTSpan<OppCurve, TCurve>* , SkChunkAlloc* );
     double closestBoundedT(const SkDPoint& pt) const;
     bool contains(double t) const;
 
-    const SkTSect<TCurve>* debugOpp() const;
+    const SkTSect<OppCurve, TCurve>* debugOpp() const;
     const SkTSpan* debugSpan(int ) const;
     const SkTSpan* debugT(double t) const;
 #ifdef SK_DEBUG
@@ -88,10 +86,10 @@ public:
         return fEndT;
     }
 
-    SkTSpan* findOppSpan(const SkTSpan* opp) const;
+    SkTSpan<OppCurve, TCurve>* findOppSpan(const SkTSpan<OppCurve, TCurve>*
opp) const;
 
-    SkTSpan* findOppT(double t) const {
-        SkTSpan* result = oppT(t);
+    SkTSpan<OppCurve, TCurve>* findOppT(double t) const {
+        SkTSpan<OppCurve, TCurve>* result = oppT(t);
         SkASSERT(result);
         return result;
     }
@@ -100,7 +98,7 @@ public:
         return SkToBool(oppT(t));
     }
 
-    int hullsIntersect(SkTSpan* span, bool* start, bool* oppStart);
+    int hullsIntersect(SkTSpan<OppCurve, TCurve>* span, bool* start, bool*
oppStart);
     void init(const TCurve& );
     void initBounds(const TCurve& );
 
@@ -108,7 +106,7 @@ public:
         return fBounded != NULL;
     }
 
-    bool linearsIntersect(SkTSpan* span);
+    bool linearsIntersect(SkTSpan<OppCurve, TCurve>* span);
     double linearT(const SkDPoint& ) const;
 
     void markCoincident() {
@@ -120,14 +118,15 @@ public:
         return fNext;
     }
 
-    bool onlyEndPointsInCommon(const SkTSpan* opp, bool* start, bool* oppStart,
bool* ptsInCommon);
+    bool onlyEndPointsInCommon(const SkTSpan<OppCurve, TCurve>* opp, bool*
start,
+            bool* oppStart, bool* ptsInCommon);
 
     const TCurve& part() const {
         return fPart;
     }
 
     bool removeAllBounded();
-    bool removeBounded(const SkTSpan* opp);
+    bool removeBounded(const SkTSpan<OppCurve, TCurve>* opp);
 
     void reset() {
         fBounded = NULL;
@@ -157,9 +156,9 @@ private:
 
     void dumpID() const;
 
-    int hullCheck(const SkTSpan* opp, bool* start, bool* oppStart);
-    int linearIntersects(const TCurve& ) const;
-    SkTSpan* oppT(double t) const;
+    int hullCheck(const SkTSpan<OppCurve, TCurve>* opp, bool* start, bool*
oppStart);
+    int linearIntersects(const OppCurve& ) const;
+    SkTSpan<OppCurve, TCurve>* oppT(double t) const;
 
     void validate() const;
     void validateBounded() const;
@@ -167,9 +166,9 @@ private:
     void validatePerpPt(double t, const SkDPoint& ) const;
 
     TCurve fPart;
-    SkTCoincident<TCurve> fCoinStart;
-    SkTCoincident<TCurve> fCoinEnd;
-    SkTSpanBounded<TCurve>* fBounded;
+    SkTCoincident<TCurve, OppCurve> fCoinStart;
+    SkTCoincident<TCurve, OppCurve> fCoinEnd;
+    SkTSpanBounded<OppCurve, TCurve>* fBounded;
     SkTSpan* fPrev;
     SkTSpan* fNext;
     SkDRect fBounds;
@@ -181,28 +180,31 @@ private:
     bool fIsLinear;
     bool fIsLine;
     bool fDeleted;
-    PATH_OPS_DEBUG_CODE(SkTSect<TCurve>* fDebugSect);
+    SkDEBUGCODE_(SkTSect<TCurve, OppCurve>* fDebugSect);
     PATH_OPS_DEBUG_T_SECT_CODE(int fID);
-    friend class SkTSect<TCurve>;
+    friend class SkTSect<TCurve, OppCurve>;
+    friend class SkTSect<OppCurve, TCurve>;
+    friend class SkTSpan<OppCurve, TCurve>;
 };
 
-template<typename TCurve>
+template<typename TCurve, typename OppCurve>
 class SkTSect {
 public:
     SkTSect(const TCurve& c  PATH_OPS_DEBUG_T_SECT_PARAMS(int id));
-    static void BinarySearch(SkTSect* sect1, SkTSect* sect2, SkIntersections*
intersections);
+    static void BinarySearch(SkTSect* sect1, SkTSect<OppCurve, TCurve>* sect2,
+            SkIntersections* intersections);
 
     // for testing only
-    bool debugHasBounded(const SkTSpan<TCurve>* ) const;
+    bool debugHasBounded(const SkTSpan<OppCurve, TCurve>* ) const;
 
-    const SkTSect* debugOpp() const {
-        return PATH_OPS_DEBUG_RELEASE(fOppSect, NULL);
+    const SkTSect<OppCurve, TCurve>* debugOpp() const {
+        return SkDEBUGRELEASE(fOppSect, NULL);
     }
 
-    const SkTSpan<TCurve>* debugSpan(int id) const;
-    const SkTSpan<TCurve>* debugT(double t) const;
+    const SkTSpan<TCurve, OppCurve>* debugSpan(int id) const;
+    const SkTSpan<TCurve, OppCurve>* debugT(double t) const;
     void dump() const;
-    void dumpBoth(SkTSect* ) const;
+    void dumpBoth(SkTSect<OppCurve, TCurve>* ) const;
     void dumpBounds(int id) const;
     void dumpCoin() const;
     void dumpCoinCurves() const;
@@ -216,82 +218,91 @@ private:
         kOneS2Set = 8
     };
 
-    SkTSpan<TCurve>* addFollowing(SkTSpan<TCurve>* prior);
-    void addForPerp(SkTSpan<TCurve>* span, double t);
-    SkTSpan<TCurve>* addOne();
+    SkTSpan<TCurve, OppCurve>* addFollowing(SkTSpan<TCurve, OppCurve>* prior);
+    void addForPerp(SkTSpan<OppCurve, TCurve>* span, double t);
+    SkTSpan<TCurve, OppCurve>* addOne();
     
-    SkTSpan<TCurve>* addSplitAt(SkTSpan<TCurve>* span, double t) {
-        SkTSpan<TCurve>* result = this->addOne();
+    SkTSpan<TCurve, OppCurve>* addSplitAt(SkTSpan<TCurve, OppCurve>* span,
double t) {
+        SkTSpan<TCurve, OppCurve>* result = this->addOne();
         result->splitAt(span, t, &fHeap);
         result->initBounds(fCurve);
         span->initBounds(fCurve);
         return result;
     }
 
-    bool binarySearchCoin(SkTSect* , double tStart, double tStep, double* t,
double* oppT);
-    SkTSpan<TCurve>* boundsMax() const;
-    void coincidentCheck(SkTSect* sect2);
+    bool binarySearchCoin(SkTSect<OppCurve, TCurve>* , double tStart, double
tStep, double* t,
+                          double* oppT);
+    SkTSpan<TCurve, OppCurve>* boundsMax() const;
+    void coincidentCheck(SkTSect<OppCurve, TCurve>* sect2);
     bool coincidentHasT(double t);
-    void computePerpendiculars(SkTSect* sect2, SkTSpan<TCurve>* first,
SkTSpan<TCurve>* last);
-    int countConsecutiveSpans(SkTSpan<TCurve>* first, SkTSpan<TCurve>** last)
const;
+    void computePerpendiculars(SkTSect<OppCurve, TCurve>* sect2,
SkTSpan<TCurve, OppCurve>* first,
+                               SkTSpan<TCurve, OppCurve>* last);
+    int countConsecutiveSpans(SkTSpan<TCurve, OppCurve>* first,
+                              SkTSpan<TCurve, OppCurve>** last) const;
 
     int debugID() const {
         return PATH_OPS_DEBUG_T_SECT_RELEASE(fID, -1);
     }
 
     void deleteEmptySpans();
-    void dumpCommon(const SkTSpan<TCurve>* ) const;
-    void dumpCommonCurves(const SkTSpan<TCurve>* ) const;
-    static int EndsEqual(const SkTSect* sect1, const SkTSect* sect2,
SkIntersections* );
-    SkTSpan<TCurve>* extractCoincident(SkTSect* sect2, SkTSpan<TCurve>* first,
-                                       SkTSpan<TCurve>* last);
-    SkTSpan<TCurve>* findCoincidentRun(SkTSpan<TCurve>* first,
SkTSpan<TCurve>** lastPtr,
-                                       const SkTSect* sect2);
-    int intersects(SkTSpan<TCurve>* span, const SkTSect* opp,
-                   SkTSpan<TCurve>* oppSpan, int* oppResult) const;
-    int linesIntersect(const SkTSpan<TCurve>* span, const SkTSect* opp,
-                       const SkTSpan<TCurve>* oppSpan, SkIntersections* )
const;
-    void markSpanGone(SkTSpan<TCurve>* span);
-    bool matchedDirection(double t, const SkTSect* sect2, double t2) const;
-    void matchedDirCheck(double t, const SkTSect* sect2, double t2,
+    void dumpCommon(const SkTSpan<TCurve, OppCurve>* ) const;
+    void dumpCommonCurves(const SkTSpan<TCurve, OppCurve>* ) const;
+    static int EndsEqual(const SkTSect* sect1, const SkTSect<OppCurve, TCurve>*
sect2,
+                         SkIntersections* );
+    SkTSpan<TCurve, OppCurve>* extractCoincident(SkTSect<OppCurve, TCurve>…
(message too large)

[caryclark, 2015-04-15 14:25:21]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-15 14:25:31]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/220001

[commit-bot: I haz the power, 2015-04-15 14:32:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-15 14:32:13]

Try jobs failed on following builders:
  Build-Ubuntu-Clang-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[caryclark, 2015-04-15 14:45:35]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-04-15 14:45:57]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/230001

[commit-bot: I haz the power, 2015-04-15 14:52:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-15 14:52:20]

This issue passed the CQ dry run.

[reed1, 2015-04-15 20:06:22]

reed@google.com changed reviewers:
+ reed@google.com

[reed1, 2015-04-15 20:06:24]

lgtm w/ questino about if (true)

https://codereview.chromium.org/1037953004/diff/230001/src/pathops/SkOpEdgeBu...
File src/pathops/SkOpEdgeBuilder.cpp (right):

https://codereview.chromium.org/1037953004/diff/230001/src/pathops/SkOpEdgeBu...
src/pathops/SkOpEdgeBuilder.cpp:118: if (true) {
do we need to keep the "else" code?

[caryclark, 2015-04-17 16:34:48]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[caryclark, 2015-04-17 16:34:49]

The patchset sent to the CQ was uploaded after l-g-t-m from reed@google.com
Link to the patchset: https://codereview.chromium.org/1037953004/#ps260001
(title: "most tests working")

[commit-bot: I haz the power, 2015-04-17 16:35:04]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/260001

[caryclark, 2015-04-17 16:37:45]

caryclark@google.com changed reviewers:
- reed@google.com

[commit-bot: I haz the power, 2015-04-17 16:46:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-17 16:46:58]

Dry run: Try jobs failed on following builders:
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[caryclark, 2015-04-17 17:24:58]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[caryclark, 2015-04-17 17:25:00]

The patchset sent to the CQ was uploaded after l-g-t-m from reed@google.com
Link to the patchset: https://codereview.chromium.org/1037953004/#ps270001
(title: "fix gcc release error")

[commit-bot: I haz the power, 2015-04-17 17:25:12]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/270001

[commit-bot: I haz the power, 2015-04-17 17:37:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-17 17:37:05]

Dry run: This issue passed the CQ dry run.

[caryclark, 2015-04-20 14:55:31]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[caryclark, 2015-04-20 14:55:33]

The patchset sent to the CQ was uploaded after l-g-t-m from reed@google.com
Link to the patchset: https://codereview.chromium.org/1037953004/#ps290001
(title: "fix looping forever bug")

[commit-bot: I haz the power, 2015-04-20 14:55:45]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/290001

[commit-bot: I haz the power, 2015-04-20 15:01:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-20 15:01:33]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-x86_64-Release-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[caryclark, 2015-04-20 15:09:49]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[caryclark, 2015-04-20 15:09:51]

The patchset sent to the CQ was uploaded after l-g-t-m from reed@google.com
Link to the patchset: https://codereview.chromium.org/1037953004/#ps300001
(title: "add missing include")

[commit-bot: I haz the power, 2015-04-20 15:09:58]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/300001

[caryclark, 2015-04-20 15:16:57]

The CQ bit was checked by caryclark@google.com to run a CQ dry run

[caryclark, 2015-04-20 15:16:59]

The patchset sent to the CQ was uploaded after l-g-t-m from reed@google.com
Link to the patchset: https://codereview.chromium.org/1037953004/#ps310001
(title: "turn off pathops specific debuggging")

[commit-bot: I haz the power, 2015-04-20 15:17:07]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/310001

[commit-bot: I haz the power, 2015-04-20 15:23:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-20 15:24:01]

Dry run: This issue passed the CQ dry run.

[caryclark, 2015-04-20 15:30:20]

The CQ bit was checked by caryclark@google.com

[commit-bot: I haz the power, 2015-04-20 15:30:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1037953004/310001

[commit-bot: I haz the power, 2015-04-20 15:32:06]

Committed patchset #27 (id:310001) as
https://skia.googlesource.com/skia/+/1049f1246e7be4ccb68001361efceb8933e6f81c