remove point aliases

src/pathops/SkOpSpan.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkOpSpan_DEFINED
 #define SkOpSpan_DEFINED
 
 #include "SkPathOpsDebug.h"
@@ skipping 351 matching lines @@
     void unaligned() {
         fAligned = false;
     }
 
     SkOpSpan* upCast() {
         SkASSERT(!final());
         return (SkOpSpan*) this;
     }
 
     const SkOpSpan* upCast() const {
-        SkASSERT(!final());
+        SkOPASSERT(!final());
         return (const SkOpSpan*) this;
     }
 
     SkOpSpan* upCastable() {
         return final() ? nullptr : upCast();
     }
 
     const SkOpSpan* upCastable() const {
         return final() ? nullptr : upCast();
     }
@@ skipping 130 matching lines @@
         SkASSERT(!final());
         fToAngle = angle;
     }
 
     void setWindSum(int windSum);
 
     void setWindValue(int windValue) {
         SkASSERT(!final());
         SkASSERT(windValue >= 0);
         SkASSERT(fWindSum == SK_MinS32);
-        SkASSERT(!windValue || !fDone);
+        SkOPASSERT(!windValue || !fDone);
         fWindValue = windValue;
     }
 
     bool sortableTop(SkOpContour* );
 
     SkOpAngle* toAngle() const {
         SkASSERT(!final());
         return fToAngle;
     }
 
     int windSum() const {
         SkASSERT(!final());
         return fWindSum;
     }
 
     int windValue() const {
-        SkASSERT(!final());
+        SkOPASSERT(!final());
         return fWindValue;
     }
 
 private:  // no direct access to internals to avoid treating a span base as a span
     SkOpSpan* fCoincident;  // linked list of spans coincident with this one (may point to itself)
     SkOpAngle* fToAngle;  // points to next angle from span start to end
     SkOpSpanBase* fNext;  // next intersection point
     int fWindSum;  // accumulated from contours surrounding this one.
     int fOppSum;  // for binary operators: the opposite winding sum
     int fWindValue;  // 0 == canceled; 1 == normal; >1 == coincident
     int fOppValue;  // normally 0 -- when binary coincident edges combine, opp value goes here
     int fTopTTry; // specifies direction and t value to try next
     bool fDone;  // if set, this span to next higher T has been processed
     mutable bool fAlreadyAdded;
 };
 
 #endif