remove point aliases

src/pathops/SkPathOpsDebug.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMutex.h"
 #include "SkOpCoincidence.h"
 #include "SkOpContour.h"
@@ skipping 564 matching lines @@
 
 void SkDRect::debugInit() {
     fLeft = fTop = fRight = fBottom = SK_ScalarNaN;
 }
 
 #include "SkOpAngle.h"
 #include "SkOpSegment.h"
 
 #if DEBUG_COINCIDENCE
 // commented-out lines keep this in sync with addT()
- const SkOpPtT* SkOpSegment::debugAddT(double t, AliasMatch allowAlias, bool* allocated) const {
+ const SkOpPtT* SkOpSegment::debugAddT(double t, bool* allocated) const {
     debugValidate();
     SkPoint pt = this->ptAtT(t);
     const SkOpSpanBase* span = &fHead;
     do {
         const SkOpPtT* result = span->ptT();
         const SkOpPtT* loop;
         bool duplicatePt;
         if (t == result->fT) {
             goto bumpSpan;
         }
-        if (this->match(result, this, t, pt, allowAlias)) {
+        if (this->match(result, this, t, pt)) {
             // see if any existing alias matches segment, pt, and t
             loop = result->next();
             duplicatePt = false;
             while (loop != result) {
                 bool ptMatch = loop->fPt == pt;
                 if (loop->segment() == this && loop->fT == t && ptMatch) {
                     goto bumpSpan;
                 }
                 duplicatePt |= ptMatch;
                 loop = loop->next();
             }
-            if (kNoAliasMatch == allowAlias) {
     bumpSpan:
-//                 span->bumpSpanAdds();
-                return result;
-            }
-//             SkOpPtT* alias = SkOpTAllocator<SkOpPtT>::Allocate(allocator);
-//             alias->init(result->span(), t, pt, duplicatePt);
-//             result->insert(alias);
-//             result->span()->unaligned();
-            this->debugValidate();
-// #if DEBUG_ADD_T
-//             SkDebugf("%s alias t=%1.9g segID=%d spanID=%d\n",  __FUNCTION__, t,
-//                     alias->segment()->debugID(), alias->span()->debugID());
-// #endif
 //             span->bumpSpanAdds();
-            if (allocated) {
-                *allocated = true;
-            }
-            return nullptr;
+             return result;
         }
         if (t < result->fT) {
             const SkOpSpan* prev = result->span()->prev();
             if (!prev) {
                 return nullptr;  // FIXME: this is a fail case; nullptr return elsewhere means result was allocated in non-const version
             }
 //             SkOpSpan* span = insert(prev, allocator);
 //             span->init(this, prev, t, pt);
             this->debugValidate();
 // #if DEBUG_ADD_T
@@ skipping 844 matching lines @@
     if (osExisting && (osExisting == oe || osExisting->contains(oeExisting ? oeExisting : oe))) {
         return;
     }
     if (oeExisting && (oeExisting == os || oeExisting->contains(osExisting ? osExisting : os))) {
         return;
     }
     bool csDeleted = false, osDeleted = false, ceDeleted = false,  oeDeleted = false;
     this->debugValidate();
     if (!cs || !os) {
         if (!cs)
-            cs = coinSeg->debugAddT(coinTs, SkOpSegment::kNoAliasMatch, nullptr);
+            cs = coinSeg->debugAddT(coinTs, nullptr);
         if (!os)
-            os = oppSeg->debugAddT(oppTs, SkOpSegment::kNoAliasMatch, nullptr);
+            os = oppSeg->debugAddT(oppTs, nullptr);
         if (cs && os) cs->span()->debugAddOppAndMerge(id, log, os->span(), &csDeleted, &osDeleted);
 //         cs = csWritable;
 //         os = osWritable;
         if ((ce && ce->deleted()) || (oe && oe->deleted())) {
             return;
         }
     }
     if (!ce || !oe) {
         if (!ce)
-            ce = coinSeg->debugAddT(coinTe, SkOpSegment::kNoAliasMatch, nullptr);
+            ce = coinSeg->debugAddT(coinTe, nullptr);
         if (!oe)
-            oe = oppSeg->debugAddT(oppTe, SkOpSegment::kNoAliasMatch, nullptr);
+            oe = oppSeg->debugAddT(oppTe, nullptr);
         if (ce && oe) ce->span()->debugAddOppAndMerge(id, log, oe->span(), &ceDeleted, &oeDeleted);
 //         ce = ceWritable;
 //         oe = oeWritable;
     }
     this->debugValidate();
     if (csDeleted || osDeleted || ceDeleted || oeDeleted) {
         return;
     }
     if (!cs || !ce || cs->contains(ce) || !os || !oe || os->contains(oe)) {
         return;
@@ skipping 951 matching lines @@
 #endif
     SkPath::FillType fillType = path.getFillType();
     SkASSERT(fillType >= SkPath::kWinding_FillType && fillType <= SkPath::kInverseEvenOdd_FillType);
     if (includeDeclaration) {
         SkDebugf("    SkPath %s;\n", name);
     }
     SkDebugf("    %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[fillType]);
     iter.setPath(path);
     showPathContours(iter, name);
 }