fix minor skp-found bugs

remove globals from pathops_unittest

BUG=skia:2460
TBR=mtklein

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/239563004

git-svn-id: http://skia.googlecode.com/svn/trunk@14378 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/PathOpsDebug.cpp b/tests/PathOpsDebug.cpp
index 5c3563ed0f..d53271af4d 100755
--- a/tests/PathOpsDebug.cpp
+++ b/tests/PathOpsDebug.cpp
@@ -202,6 +202,10 @@ void SkIntersectionHelper::dump() const {
     }
 }
 
+const SkTDArray<SkOpSpan>& SkOpSegment::debugSpans() const {
+    return fTs;
+}
+
 void SkOpSegment::dumpAngles() const {
     SkDebugf("((SkOpSegment*) 0x%p) [%d]\n", this, debugID());
     int fromIndex = -1, toIndex = -1;
@@ -371,8 +375,8 @@ const SkOpSegment* SkOpSpan::debugToSegment(ptrdiff_t* spanIndex) const {
         }
         SkASSERT(otherTestT == fOtherT);
         const SkOpSegment* candidate = otherSpan.fOther;
-        const SkOpSpan* first = candidate->spans().begin();
-        const SkOpSpan* last = candidate->spans().end() - 1;
+        const SkOpSpan* first = candidate->debugSpans().begin();
+        const SkOpSpan* last = candidate->debugSpans().end() - 1;
         if (first <= this && this <= last) {
             if (spanIndex) {
                 *spanIndex = this - first;
@@ -415,12 +419,6 @@ void SkOpSpan::dumpOne() const {
     if (fDone) {
         SkDebugf(" done");
     }
-    if (fUnsortableStart) {
-        SkDebugf("  unsortable-start");
-    }
-    if (fUnsortableEnd) {
-        SkDebugf(" unsortable-end");
-    }
     if (fTiny) {
         SkDebugf(" tiny");
     }