path ops work in progress

tests/PathOpsExtendedTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PathOpsExtendedTest.h"
 #include "PathOpsThreadedCommon.h"
 #include "SkBitmap.h"
@@ skipping 536 matching lines @@
     SkBitmap bitmap;
     int result = comparePaths(reporter, path, out, bitmap);
     if (result && gPathStrAssert) {
         REPORTER_ASSERT(reporter, 0);
     }
     reporter->bumpTestCount();
     return result == 0;
 }
 
 #if DEBUG_SHOW_TEST_NAME
-void DebugShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp, const char* testName) {
-        ShowFunctionHeader(testName);
-        showPath(a, "path", true);
-        showPath(b, "pathB", true);
-        ShowOp(shapeOp, "path", "pathB");
+void SkPathOpsDebug::ShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp,
+        const char* testName) {
+    ShowFunctionHeader(testName);
+    showPath(a, "path", true);
+    showPath(b, "pathB", true);
+    ShowOp(shapeOp, "path", "pathB");
 }
 #endif
 
 static bool innerPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName, bool threaded) {
 #if DEBUG_SHOW_TEST_NAME
     if (testName == NULL) {
         SkDebugf("\n");
         showPathData(a);
         showOp(shapeOp);
         showPathData(b);
     } else {
-        DebugShowPath(a, b, shapeOp, testName);
+        SkPathOpsDebug::ShowPath(a, b, shapeOp, testName);
     }
 #endif
     SkPath out;
     if (!Op(a, b, shapeOp, &out) ) {
         SkDebugf("%s did not expect failure\n", __FUNCTION__);
         REPORTER_ASSERT(reporter, 0);
         return false;
     }
     if (threaded && !reporter->verbose()) {
         return true;
@@ skipping 36 matching lines @@
     return innerPathOp(reporter, a, b, shapeOp, testName, false);
 }
 
 bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp, const char* testName) {
     return innerPathOp(reporter, a, b, shapeOp, testName, true);
 }
 
 int initializeTests(skiatest::Reporter* reporter, const char* test) {
 #ifdef SK_DEBUG
-    gDebugMaxWindSum = 4;
-    gDebugMaxWindValue = 4;
+    SkPathOpsDebug::gMaxWindSum = 4;
+    SkPathOpsDebug::gMaxWindValue = 4;
 #endif
     testName = test;
     size_t testNameSize = strlen(test);
     SkFILEStream inFile("../../experimental/Intersection/op.htm");
     if (inFile.isValid()) {
         SkTDArray<char> inData;
         inData.setCount(inFile.getLength());
         size_t inLen = inData.count();
         inFile.read(inData.begin(), inLen);
         inFile.setPath(NULL);
@@ skipping 54 matching lines @@
         }
         if (tests[index].fun == stopTest) {
             SkDebugf("lastTest\n");
         }
         if (index == last) {
             break;
         }
         index += reverse ? -1 : 1;
     } while (true);
 }