diff options
| author |  caryclark <caryclark@google.com> | 2015-05-22 06:26:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-22 06:26:52 -0700 |
| commit | a76b7a3b04bc0e937921a1eb38d713c619e60e4e (patch) | |
| tree | 5531fd1ba5a03aead9c7514bb236f8b442331245 /samplecode/SampleQuadStroker.cpp | |
| parent | 051a51ec32549078a65ade19e42df0b9d9f9a3ff (diff) | |
remove SK_LEGACY_STROKE_CURVES
The change in Chrome has been landed so this guard is no longer needed.
R=reed@google.com,fmalita@chromium.org
BUG=102411
Review URL: https://codereview.chromium.org/1157623003
Diffstat (limited to 'samplecode/SampleQuadStroker.cpp')
| -rw-r--r-- | samplecode/SampleQuadStroker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp index 05b6204026..91a6a0f5d8 100644 --- a/samplecode/SampleQuadStroker.cpp +++ b/samplecode/SampleQuadStroker.cpp @@ -122,7 +122,7 @@ class QuadStrokerView : public SampleView { 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 @@ -529,7 +529,7 @@ protected: 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 @@ -561,7 +561,7 @@ protected: 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); } @@ -612,7 +612,7 @@ protected: } 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)); |