cumulative pathops patch

tests/PathOpsOpRectThreadedTest.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"
 
 // four rects, of four sizes
@@ skipping 41 matching lines @@
                 SkIntToScalar(state.fB), SkPath::kCW_Direction);
         pathA.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD),
                 SkIntToScalar(state.fD), SkPath::kCW_Direction);
         pathA.close();
         pathB.setFillType((SkPath::FillType) f);
         pathB.addRect(SkIntToScalar(a), SkIntToScalar(a), SkIntToScalar(b),
                 SkIntToScalar(b), SkPath::kCW_Direction);
         pathB.addRect(SkIntToScalar(c), SkIntToScalar(c), SkIntToScalar(d),
                 SkIntToScalar(d), SkPath::kCW_Direction);
         pathB.close();
-        for (int op = 0 ; op <= kXOR_PathOp; ++op)    {
+        for (int op = 0 ; op <= kXOR_SkPathOp; ++op)    {
             if (progress) {
                 outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
             }
             testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "rects");
         }
     }
                     }
                 }
             }
         }
@@ skipping 10 matching lines @@
                     *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
                             (&testPathOpsRectsMain, a, b, c, d, &testRunner));
                 }
             }
             if (!reporter->allowExtendedTest()) goto finish;
        }
     }
 finish:
     testRunner.render();
 }