| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright 2012 Google Inc. |    2  * Copyright 2012 Google Inc. | 
|    3  * |    3  * | 
|    4  * Use of this source code is governed by a BSD-style license that can be |    4  * Use of this source code is governed by a BSD-style license that can be | 
|    5  * found in the LICENSE file. |    5  * found in the LICENSE file. | 
|    6  */ |    6  */ | 
|    7 #ifndef SkOpSegment_DEFINE |    7 #ifndef SkOpSegment_DEFINE | 
|    8 #define SkOpSegment_DEFINE |    8 #define SkOpSegment_DEFINE | 
|    9  |    9  | 
|   10 #include "SkOpAngle.h" |   10 #include "SkOpAngle.h" | 
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  277     void addCurveTo(int start, int end, SkPathWriter* path, bool active) const; |  277     void addCurveTo(int start, int end, SkPathWriter* path, bool active) const; | 
|  278     void addEndSpan(int endIndex); |  278     void addEndSpan(int endIndex); | 
|  279     void addLine(const SkPoint pts[2], bool operand, bool evenOdd); |  279     void addLine(const SkPoint pts[2], bool operand, bool evenOdd); | 
|  280     void addOtherT(int index, double otherT, int otherIndex); |  280     void addOtherT(int index, double otherT, int otherIndex); | 
|  281     void addQuad(const SkPoint pts[3], bool operand, bool evenOdd); |  281     void addQuad(const SkPoint pts[3], bool operand, bool evenOdd); | 
|  282     void addSimpleAngle(int endIndex); |  282     void addSimpleAngle(int endIndex); | 
|  283     int addSelfT(const SkPoint& pt, double newT); |  283     int addSelfT(const SkPoint& pt, double newT); | 
|  284     void addStartSpan(int endIndex); |  284     void addStartSpan(int endIndex); | 
|  285     int addT(SkOpSegment* other, const SkPoint& pt, double newT); |  285     int addT(SkOpSegment* other, const SkPoint& pt, double newT); | 
|  286     void addTCancel(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* o
     ther); |  286     void addTCancel(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* o
     ther); | 
|  287     void addTCoincident(const SkPoint& startPt, const SkPoint& endPt, double end
     T, |  287     bool addTCoincident(const SkPoint& startPt, const SkPoint& endPt, double end
     T, | 
|  288                         SkOpSegment* other); |  288                         SkOpSegment* other); | 
|  289     const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool b
     orrowWind, |  289     const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool b
     orrowWind, | 
|  290                              const SkPoint& pt); |  290                              const SkPoint& pt); | 
|  291     const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool b
     orrowWind, |  291     const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool b
     orrowWind, | 
|  292                              const SkPoint& pt, const SkPoint& oPt); |  292                              const SkPoint& pt, const SkPoint& oPt); | 
|  293     void alignMultiples(SkTDArray<AlignedSpan>* aligned); |  293     void alignMultiples(SkTDArray<AlignedSpan>* aligned); | 
|  294     bool alignSpan(int index, double thisT, const SkPoint& thisPt); |  294     bool alignSpan(int index, double thisT, const SkPoint& thisPt); | 
|  295     void alignSpanState(int start, int end); |  295     void alignSpanState(int start, int end); | 
|  296     bool betweenTs(int lesser, double testT, int greater) const; |  296     bool betweenTs(int lesser, double testT, int greater) const; | 
|  297     void blindCancel(const SkCoincidence& coincidence, SkOpSegment* other); |  297     void blindCancel(const SkCoincidence& coincidence, SkOpSegment* other); | 
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  546     bool fSmall;  // set if some span is small |  546     bool fSmall;  // set if some span is small | 
|  547     bool fTiny;  // set if some span is tiny |  547     bool fTiny;  // set if some span is tiny | 
|  548 #if defined(SK_DEBUG) || !FORCE_RELEASE |  548 #if defined(SK_DEBUG) || !FORCE_RELEASE | 
|  549     int fID; |  549     int fID; | 
|  550 #endif |  550 #endif | 
|  551  |  551  | 
|  552     friend class PathOpsSegmentTester; |  552     friend class PathOpsSegmentTester; | 
|  553 }; |  553 }; | 
|  554  |  554  | 
|  555 #endif |  555 #endif | 
| OLD | NEW |