remove SK_SUPPORT_LEGACY_PATHOP_ENUMS

include/pathops/SkPathOps.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPathOps_DEFINED
 #define SkPathOps_DEFINED
 
 #include "SkPreConfig.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 
 class SkPath;
 struct SkRect;
 
 
-// FIXME: remove this once the define in src/skia/SkUserConfig.h lands
-#ifndef SK_SUPPORT_LEGACY_PATHOP_ENUMS
-#define SK_SUPPORT_LEGACY_PATHOP_ENUMS
-#endif
-
 // FIXME: move everything below into the SkPath class
 /**
   *  The logical operations that can be performed when combining two paths.
   */
 enum SkPathOp {
     kDifference_SkPathOp,         //!< subtract the op path from the first path
     kIntersect_SkPathOp,          //!< intersect the two paths
     kUnion_SkPathOp,              //!< union (inclusive-or) the two paths
     kXOR_SkPathOp,                //!< exclusive-or the two paths
     kReverseDifference_SkPathOp,  //!< subtract the first path from the op path
-
-#ifdef SK_SUPPORT_LEGACY_PATHOP_ENUMS
-    kDifference_PathOp = 0,     //!< subtract the op path from the first path
-    kIntersect_PathOp,          //!< intersect the two paths
-    kUnion_PathOp,              //!< union (inclusive-or) the two paths
-    kXOR_PathOp,                //!< exclusive-or the two paths
-    kReverseDifference_PathOp,  //!< subtract the first path from the op path
-#endif
 };
 
 /** Set this path to the result of applying the Op to this path and the
     specified path: this = (this op operand).
     The resulting path will be constructed from non-overlapping contours.
     The curve order is reduced where possible so that cubics may be turned
     into quadratics, and quadratics maybe turned into lines.
 
     Returns true if operation was able to produce a result;
     otherwise, result is unmodified.
@@ skipping 50 matching lines @@
     bool resolve(SkPath* result);
 
 private:
     SkTArray<SkPath> fPathRefs;
     SkTDArray<SkPathOp> fOps;
 
     void reset();
 };
 
 #endif