fix minor skp-found bugs

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"
 #include "SkCanvas.h"
 #include "SkForceLinking.h"
 #include "SkMatrix.h"
-#include "SkPaint.h"
+#include "SkPaint.h" 
 #include "SkRTConf.h"
 #include "SkStream.h"
 #include "SkThread.h"
 #include "SkThreadPool.h"
 
 #ifdef SK_BUILD_FOR_MAC
 #include <sys/sysctl.h>
 #endif
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
@@ skipping 534 matching lines @@
     SkBitmap bitmap;
     int result = comparePaths(reporter, filename, path, out, bitmap);
     if (result && gPathStrAssert) {
         REPORTER_ASSERT(reporter, 0);
     }
     reporter->bumpTestCount();
     return result == 0;
 }
 
 #if DEBUG_SHOW_TEST_NAME
+
+SK_DECLARE_STATIC_MUTEX(gTestMutex);
+
 void SkPathOpsDebug::ShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp,
         const char* testName) {
+    SkAutoMutexAcquire ac(gTestMutex);
     ShowFunctionHeader(testName);
     showPath(a, "path", true);
     showPath(b, "pathB", true);
     ShowOp(shapeOp, "path", "pathB");
 }
 #endif
 
 #if DEBUG_SHOW_TEST_NAME
 static void showName(const SkPath& a, const SkPath& b, const SkPathOp shapeOp) {
     SkDebugf("\n");
@@ skipping 74 matching lines @@
     return innerPathOp(reporter, a, b, shapeOp, testName, true);
 }
 
 SK_DECLARE_STATIC_MUTEX(gMutex);
 
 int initializeTests(skiatest::Reporter* reporter, const char* test) {
 #if 0  // doesn't work yet
     SK_CONF_SET("images.jpeg.suppressDecoderWarnings", true);
     SK_CONF_SET("images.png.suppressDecoderWarnings", true);
 #endif
-#ifdef SK_DEBUG
-    SkPathOpsDebug::gMaxWindSum = 4;
-    SkPathOpsDebug::gMaxWindValue = 4;
-#endif
     if (reporter->verbose()) {
         SkAutoMutexAcquire lock(gMutex);
         testName = test;
         size_t testNameSize = strlen(test);
         SkFILEStream inFile("../../experimental/Intersection/op.htm");
         if (inFile.isValid()) {
             SkTDArray<char> inData;
             inData.setCount((int) inFile.getLength());
             size_t inLen = inData.count();
             inFile.read(inData.begin(), inLen);
@@ skipping 60 matching lines @@
         if (tests[index].fun == stopTest) {
             SkDebugf("lastTest\n");
             break;
         }
         if (index == last) {
             break;
         }
         index += reverse ? -1 : 1;
     } while (true);
 }