remove SK_LEGACY_STROKE_CURVES

samplecode/SampleQuadStroker.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 "sk_tool_utils.h"
 #include "SampleCode.h"
 #include "SkView.h"
@@ skipping 104 matching lines @@
     StrokeTypeButton fTextButton;
     SkString fText;
     SkScalar fTextSize;
     SkScalar fWeight;
     SkScalar fWidth, fDWidth;
     SkScalar fWidthScale;
     int fW, fH, fZoom;
     bool fAnimate;
     bool fDrawRibs;
     bool fDrawTangents;
-#if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
+#ifdef SK_DEBUG
     #define kStrokerErrorMin 0.001f
     #define kStrokerErrorMax 5
 #endif
     #define kWidthMin 1
     #define kWidthMax 100
 public:
     QuadStrokerView() {
         this->setBGColor(SK_ColorLTGRAY);
 
         fPts[0].set(50, 200);  // cubic
@@ skipping 386 matching lines @@
             if (fDWidth > 0 && fWidth > kWidthMax) {
                 fDWidth = -fDWidth;
             } else if (fDWidth < 0 && fWidth < kWidthMin) {
                 fDWidth = -fDWidth;
             }
         }
         setAsNeeded();
         if (fConicButton.fEnabled) {
             draw_control(canvas, fWeightControl, fWeight, 0, 5, "weight");
         }
-#if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
+#ifdef SK_DEBUG
         draw_control(canvas, fErrorControl, gDebugStrokerError, kStrokerErrorMin, kStrokerErrorMax,
                 "error");
 #endif
         draw_control(canvas, fWidthControl, fWidth * fWidthScale, kWidthMin * fWidthScale,
                 kWidthMax * fWidthScale, "width");
         draw_button(canvas, fQuadButton);
         draw_button(canvas, fCubicButton);
         draw_button(canvas, fConicButton);
         draw_button(canvas, fRRectButton);
         draw_button(canvas, fCircleButton);
@@ skipping 11 matching lines @@
                                               unsigned modi) override {
         for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); ++i) {
             if (hittest(fPts[i], x, y)) {
                 return new MyClick(this, (int)i);
             }
         }
         const SkRect& rectPt = SkRect::MakeXYWH(x, y, 1, 1);
         if (fWeightControl.contains(rectPt)) {
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 1);
         }
-#if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
+#ifdef SK_DEBUG
         if (fErrorControl.contains(rectPt)) {
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 2);
         }
 #endif
         if (fWidthControl.contains(rectPt)) {
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 3);
         }
         if (fCubicButton.fBounds.contains(rectPt)) {
             fCubicButton.fEnabled ^= true;
             return new MyClick(this, (int) SK_ARRAY_COUNT(fPts) + 4);
@@ skipping 30 matching lines @@
 
     bool onClick(Click* click) override {
         int index = ((MyClick*)click)->fIndex;
         if (index < (int) SK_ARRAY_COUNT(fPts)) {
             fPts[index].offset(SkIntToScalar(click->fICurr.fX - click->fIPrev.fX),
                                SkIntToScalar(click->fICurr.fY - click->fIPrev.fY));
             this->inval(NULL);
         } else if (index == (int) SK_ARRAY_COUNT(fPts) + 1) {
             fWeight = MapScreenYtoValue(click->fICurr.fY, fWeightControl, 0, 5);
         }
-#if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
+#ifdef SK_DEBUG
         else if (index == (int) SK_ARRAY_COUNT(fPts) + 2) {
             gDebugStrokerError = SkTMax(FLT_EPSILON, MapScreenYtoValue(click->fICurr.fY,
                     fErrorControl, kStrokerErrorMin, kStrokerErrorMax));
             gDebugStrokerErrorSet = true;
         }
 #endif
         else if (index == (int) SK_ARRAY_COUNT(fPts) + 3) {
             fWidth = SkTMax(FLT_EPSILON, MapScreenYtoValue(click->fICurr.fY, fWidthControl,
                     kWidthMin, kWidthMax));
             fAnimate = fWidth <= kWidthMin;
         }
         return true;
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SkView* F2() { return new QuadStrokerView; }
 static SkViewRegister gR2(F2);