path ops stream-lining

src/pathops/SkOpSegment.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 SkOpSegment_DEFINE
 #define SkOpSegment_DEFINE
 
 #include "SkOpAngle.h"
@@ skipping 74 matching lines @@
     }
 
     SkOpSegment* addQuad(SkPoint pts[3], SkOpContour* parent) {
         init(pts, 1, parent, SkPath::kQuad_Verb);
         SkDCurve curve;
         curve.fQuad.set(pts);
         curve.setQuadBounds(pts, 1, 0, 1, &fBounds);
         return this;
     }
 
-    SkOpPtT* addT(double t, bool* allocated);
+    SkOpPtT* addT(double t);
 
     template<typename T> T* allocateArray(int count) {
         return SkOpTAllocator<T>::AllocateArray(this->globalState()->allocator(), count);
     }
 
     const SkPathOpsBounds& bounds() const {
         return fBounds;
     }
 
     void bumpCount() {
@@ skipping 15 matching lines @@
 
     SkOpContour* contour() const {
         return fContour;
     }
 
     int count() const {
         return fCount;
     }
 
     void debugAddAngle(double startT, double endT);
-    const SkOpPtT* debugAddT(double t, bool* allocated) const;
+    const SkOpPtT* debugAddT(double t) const;
     const SkOpAngle* debugAngle(int id) const;
 #if DEBUG_ANGLE
     void debugCheckAngleCoin() const;
 #endif
 #if DEBUG_COINCIDENCE_VERBOSE
     void debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* ) const;
     void debugClearAll(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
     void debugClearOne(const SkOpSpan* span, const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
 #endif
     const SkOpCoincidence* debugCoincidence() const;
@@ skipping 82 matching lines @@
         return &fHead;
     }
 
     SkOpSpan* head() {
         return &fHead;
     }
 
     void init(SkPoint pts[], SkScalar weight, SkOpContour* parent, SkPath::Verb verb);
 
     SkOpSpan* insert(SkOpSpan* prev) {
-        SkOpSpan* result = SkOpTAllocator<SkOpSpan>::Allocate(this->globalState()->allocator());
+        SkOpGlobalState* globalState = this->globalState();
+        globalState->setAllocatedOpSpan();
+        SkOpSpan* result = SkOpTAllocator<SkOpSpan>::Allocate(globalState->allocator());
         SkOpSpanBase* next = prev->next();
         result->setPrev(prev);
         prev->setNext(result);
         SkDEBUGCODE(result->ptT()->fT = 0);
         result->setNext(next);
         if (next) {
             next->setPrev(result);
         }
         return result;
     }
@@ skipping 201 matching lines @@
     mutable SkScalar fDebugBaseMin;  // if > 0, the 1st t value in this seg vis-a-vis the ref seg
     mutable SkScalar fDebugBaseMax;
     mutable int fDebugLastIndex;
     mutable SkScalar fDebugLastMin;  // if > 0, the last t -- next t val - base has same sign
     mutable SkScalar fDebugLastMax;
 #endif
     SkDEBUGCODE(int fID);
 };
 
 #endif