align top and bounds computations

src/pathops/SkPathOpsDebug.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOpsDebug_DEFINED
 #define SkPathOpsDebug_DEFINED
 
 #include "SkPathOps.h"
@@ skipping 19 matching lines @@
 #else
     #define SK_SNPRINTF snprintf
 #endif
 
 #define WIND_AS_STRING(x) char x##Str[12]; \
         if (!SkPathOpsDebug::ValidWind(x)) strcpy(x##Str, "?"); \
         else SK_SNPRINTF(x##Str, sizeof(x##Str), "%d", x)
 
 #if FORCE_RELEASE
 
-#define DEBUG_CUBIC_SWAP_TOP 0
-
 #define DEBUG_ACTIVE_OP 0
 #define DEBUG_ACTIVE_SPANS 0
 #define DEBUG_ADD_INTERSECTING_TS 0
 #define DEBUG_ADD_T 0
 #define DEBUG_ANGLE 0
 #define DEBUG_ASSEMBLE 0
 #define DEBUG_CUBIC_BINARY_SEARCH 0
 #define DEBUG_CUBIC_SPLIT 0
-#define DEBUG_DUMP_SEGMENTS DEBUG_CUBIC_SWAP_TOP
+#define DEBUG_DUMP_SEGMENTS 0 // 1
 #define DEBUG_FLOW 0
 #define DEBUG_LIMIT_WIND_SUM 0
 #define DEBUG_MARK_DONE 0
 #define DEBUG_PATH_CONSTRUCTION 0
 #define DEBUG_PERP 0
-#define DEBUG_SHOW_TEST_NAME DEBUG_CUBIC_SWAP_TOP
+#define DEBUG_SHOW_TEST_NAME 0 // 1
 #define DEBUG_SORT 0
-#define DEBUG_SWAP_TOP DEBUG_CUBIC_SWAP_TOP
+#define DEBUG_SWAP_TOP 0 // 1
 #define DEBUG_T_SECT 0
 #define DEBUG_T_SECT_DUMP 0
 #define DEBUG_VALIDATE 0
 #define DEBUG_WINDING 0
 #define DEBUG_WINDING_AT_T 0
 
-#undef DEBUG_CUBIC_SWAP_TOP
-
 #else
 
 #define DEBUG_ACTIVE_OP 1
 #define DEBUG_ACTIVE_SPANS 1
 #define DEBUG_ADD_INTERSECTING_TS 1
 #define DEBUG_ADD_T 1
 #define DEBUG_ANGLE 1
 #define DEBUG_ASSEMBLE 1
 #define DEBUG_CUBIC_BINARY_SEARCH 0
 #define DEBUG_CUBIC_SPLIT 1
@@ skipping 153 matching lines @@
 void Dump(const SkTDArray<class SkOpContour* >* contours);
 void DumpAll(SkTDArray<class SkOpContour* >* contours);
 void DumpAngles(const SkTDArray<class SkOpContour* >* contours);
 void DumpCoin(const SkTDArray<class SkOpContour* >* contours);
 void DumpPt(const SkTDArray<class SkOpContour* >* contours, int segmentID);
 void DumpPts(const SkTDArray<class SkOpContour* >* contours);
 void DumpSegment(const SkTDArray<class SkOpContour* >* contours, int segmentID);
 void DumpSpan(const SkTDArray<class SkOpContour* >* contours, int spanID);
 void DumpSpans(const SkTDArray<class SkOpContour* >* contours);
 #endif