| Index: src/pathops/SkPathOpsTSect.cpp
|
| diff --git a/src/pathops/SkPathOpsTSect.cpp b/src/pathops/SkPathOpsTSect.cpp
|
| index 1549e6b8fde0301ca19cd439686ee4696a6ad6aa..3e7817ca9e91eaf96761d1d56dc467dd9c1634ff 100644
|
| --- a/src/pathops/SkPathOpsTSect.cpp
|
| +++ b/src/pathops/SkPathOpsTSect.cpp
|
| @@ -8,43 +8,55 @@
|
| #include "SkPathOpsTSect.h"
|
|
|
| int SkIntersections::intersect(const SkDQuad& quad1, const SkDQuad& quad2) {
|
| - SkTSect<SkDQuad, SkDQuad> sect1(quad1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDQuad, SkDQuad> sect2(quad2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDQuad, SkDQuad> sect1(quad1
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDQuad, SkDQuad> sect2(quad2
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDQuad, SkDQuad>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|
| int SkIntersections::intersect(const SkDConic& conic, const SkDQuad& quad) {
|
| - SkTSect<SkDConic, SkDQuad> sect1(conic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDQuad, SkDConic> sect2(quad PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDConic, SkDQuad> sect1(conic
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDQuad, SkDConic> sect2(quad
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDConic, SkDQuad>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|
| int SkIntersections::intersect(const SkDConic& conic1, const SkDConic& conic2) {
|
| - SkTSect<SkDConic, SkDConic> sect1(conic1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDConic, SkDConic> sect2(conic2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDConic, SkDConic> sect1(conic1
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDConic, SkDConic> sect2(conic2
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDConic, SkDConic>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|
| int SkIntersections::intersect(const SkDCubic& cubic, const SkDQuad& quad) {
|
| - SkTSect<SkDCubic, SkDQuad> sect1(cubic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDQuad, SkDCubic> sect2(quad PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDCubic, SkDQuad> sect1(cubic
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDQuad, SkDCubic> sect2(quad
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDCubic, SkDQuad>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|
| int SkIntersections::intersect(const SkDCubic& cubic, const SkDConic& conic) {
|
| - SkTSect<SkDCubic, SkDConic> sect1(cubic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDConic, SkDCubic> sect2(conic PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDCubic, SkDConic> sect1(cubic
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDConic, SkDCubic> sect2(conic
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDCubic, SkDConic>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|
| int SkIntersections::intersect(const SkDCubic& cubic1, const SkDCubic& cubic2) {
|
| - SkTSect<SkDCubic, SkDCubic> sect1(cubic1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| - SkTSect<SkDCubic, SkDCubic> sect2(cubic2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| + SkTSect<SkDCubic, SkDCubic> sect1(cubic1
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(1));
|
| + SkTSect<SkDCubic, SkDCubic> sect2(cubic2
|
| + SkDEBUGPARAMS(debugGlobalState()) PATH_OPS_DEBUG_T_SECT_PARAMS(2));
|
| SkTSect<SkDCubic, SkDCubic>::BinarySearch(§1, §2, this);
|
| return used();
|
| }
|
|
|