aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gyp/common.gypi1
-rw-r--r--samplecode/SampleQuadStroker.cpp8
-rw-r--r--src/core/SkStroke.cpp34
-rw-r--r--src/core/SkStroke.h2
-rw-r--r--src/core/SkStrokeRec.cpp4
5 files changed, 24 insertions, 25 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 9e48c17b96..ce3fc2669d 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -15,7 +15,6 @@
'SK_INTERNAL',
'SK_GAMMA_SRGB',
'SK_GAMMA_APPLY_TO_A8',
- 'SK_QUAD_STROKE_APPROXIMATION',
'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar
# 'SK_USE_DISCARDABLE_SCALEDIMAGECACHE', # TODO(reed): Re-enable when tests don't crash with this.
],
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
index a3863a8991..37663d22a0 100644
--- a/samplecode/SampleQuadStroker.cpp
+++ b/samplecode/SampleQuadStroker.cpp
@@ -122,7 +122,7 @@ class QuadStrokerView : public SampleView {
bool fAnimate;
bool fDrawRibs;
bool fDrawTangents;
-#if QUAD_STROKE_APPROXIMATION && defined(SK_DEBUG)
+#if !defined SK_LEGACY_STROKE_CURVES && defined(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 QUAD_STROKE_APPROXIMATION && defined(SK_DEBUG)
+#if !defined SK_LEGACY_STROKE_CURVES && defined(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 QUAD_STROKE_APPROXIMATION && defined(SK_DEBUG)
+#if !defined SK_LEGACY_STROKE_CURVES && defined(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 QUAD_STROKE_APPROXIMATION && defined(SK_DEBUG)
+#if !defined SK_LEGACY_STROKE_CURVES && defined(SK_DEBUG)
else if (index == (int) SK_ARRAY_COUNT(fPts) + 2) {
gDebugStrokerError = SkTMax(FLT_EPSILON, MapScreenYtoValue(click->fICurr.fY,
fErrorControl, kStrokerErrorMin, kStrokerErrorMax));
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index 5c65e6eb01..29da19f4c5 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -9,7 +9,7 @@
#include "SkGeometry.h"
#include "SkPath.h"
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
enum {
kTangent_RecursiveLimit,
@@ -51,7 +51,7 @@
#endif
-#ifndef SK_QUAD_STROKE_APPROXIMATION
+#ifdef SK_LEGACY_STROKE_CURVES
#define kMaxQuadSubdivide 5
#define kMaxCubicSubdivide 7
#endif
@@ -60,7 +60,7 @@ static inline bool degenerate_vector(const SkVector& v) {
return !SkPoint::CanNormalize(v.fX, v.fY);
}
-#ifndef SK_QUAD_STROKE_APPROXIMATION
+#ifdef SK_LEGACY_STROKE_CURVES
static inline bool normals_too_curvy(const SkVector& norm0, SkVector& norm1) {
/* root2/2 is a 45-degree angle
make this constant bigger for more subdivisions (but not >= 1)
@@ -113,7 +113,7 @@ static bool set_normal_unitnormal(const SkVector& vec,
}
///////////////////////////////////////////////////////////////////////////////
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
struct SkQuadConstruct { // The state of the quad stroke under construction.
SkPoint fQuad[3]; // the stroked quad parallel to the original curve
@@ -165,7 +165,7 @@ public:
void moveTo(const SkPoint&);
void lineTo(const SkPoint&);
void quadTo(const SkPoint&, const SkPoint&);
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
void conicTo(const SkPoint&, const SkPoint&, SkScalar weight);
#endif
void cubicTo(const SkPoint&, const SkPoint&, const SkPoint&);
@@ -183,7 +183,7 @@ private:
SkScalar fRadius;
SkScalar fInvMiterLimit;
SkScalar fResScale;
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
SkScalar fInvResScale;
SkScalar fInvResScaleSquared;
#endif
@@ -200,7 +200,7 @@ private:
SkPath fInner, fOuter; // outer is our working answer, inner is temp
SkPath fExtra; // added as extra complete contours
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
enum StrokeType {
kOuter_StrokeType = 1, // use sign-opposite values later to flip perpendicular axis
kInner_StrokeType = -1
@@ -277,7 +277,7 @@ private:
const SkVector& unitNormal);
void line_to(const SkPoint& currPt, const SkVector& normal);
-#ifndef SK_QUAD_STROKE_APPROXIMATION
+#ifdef SK_LEGACY_STROKE_CURVES
void quad_to(const SkPoint pts[3],
const SkVector& normalAB, const SkVector& unitNormalAB,
SkVector* normalBC, SkVector* unitNormalBC,
@@ -390,7 +390,7 @@ SkPathStroker::SkPathStroker(const SkPath& src,
fOuter.setIsVolatile(true);
fInner.incReserve(src.countPoints());
fInner.setIsVolatile(true);
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
// TODO : write a common error function used by stroking and filling
// The '4' below matches the fill scan converter's error term
fInvResScale = SkScalarInvert(resScale * 4);
@@ -423,7 +423,7 @@ void SkPathStroker::lineTo(const SkPoint& currPt) {
this->postJoinTo(currPt, normal, unitNormal);
}
-#ifndef SK_QUAD_STROKE_APPROXIMATION
+#ifdef SK_LEGACY_STROKE_CURVES
void SkPathStroker::quad_to(const SkPoint pts[3],
const SkVector& normalAB, const SkVector& unitNormalAB,
SkVector* normalBC, SkVector* unitNormalBC,
@@ -461,7 +461,7 @@ void SkPathStroker::quad_to(const SkPoint pts[3],
}
#endif
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
void SkPathStroker::setQuadEndNormal(const SkPoint quad[3], const SkVector& normalAB,
const SkVector& unitNormalAB, SkVector* normalBC, SkVector* unitNormalBC) {
if (!set_normal_unitnormal(quad[1], quad[2], fRadius, normalBC, unitNormalBC)) {
@@ -774,7 +774,7 @@ DRAW_LINE:
}
#endif
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
void SkPathStroker::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar weight) {
const SkConic conic(fPrevPt, pt1, pt2, weight);
SkPoint reduction;
@@ -812,7 +812,7 @@ void SkPathStroker::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar wei
#endif
void SkPathStroker::quadTo(const SkPoint& pt1, const SkPoint& pt2) {
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
const SkPoint quad[3] = { fPrevPt, pt1, pt2 };
SkPoint reduction;
ReductionType reductionType = CheckQuadLinear(quad, &reduction);
@@ -900,7 +900,7 @@ void SkPathStroker::quadTo(const SkPoint& pt1, const SkPoint& pt2) {
this->postJoinTo(pt2, normalBC, unitBC);
}
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
// Given a point on the curve and its derivative, scale the derivative by the radius, and
// compute the perpendicular point and its tangent.
void SkPathStroker::setRayPts(const SkPoint& tPt, SkVector* dxy, SkPoint* onPt,
@@ -1376,7 +1376,7 @@ bool SkPathStroker::quadStroke(const SkPoint quad[3], SkQuadConstruct* quadPts)
void SkPathStroker::cubicTo(const SkPoint& pt1, const SkPoint& pt2,
const SkPoint& pt3) {
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
const SkPoint cubic[4] = { fPrevPt, pt1, pt2, pt3 };
SkPoint reduction[3];
const SkPoint* tangentPt;
@@ -1580,7 +1580,7 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
}
SkAutoConicToQuads converter;
-#ifndef SK_QUAD_STROKE_APPROXIMATION
+#ifdef SK_LEGACY_STROKE_CURVES
const SkScalar conicTol = SK_Scalar1 / 4 / fResScale;
#endif
SkPathStroker stroker(src, radius, fMiterLimit, this->getCap(), this->getJoin(), fResScale);
@@ -1602,7 +1602,7 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
lastSegment = SkPath::kQuad_Verb;
break;
case SkPath::kConic_Verb: {
-#ifdef SK_QUAD_STROKE_APPROXIMATION
+#ifndef SK_LEGACY_STROKE_CURVES
stroker.conicTo(pts[1], pts[2], iter.conicWeight());
lastSegment = SkPath::kConic_Verb;
break;
diff --git a/src/core/SkStroke.h b/src/core/SkStroke.h
index 0574f386b3..85ef0c8a34 100644
--- a/src/core/SkStroke.h
+++ b/src/core/SkStroke.h
@@ -13,7 +13,7 @@
#include "SkPaint.h"
#include "SkStrokerPriv.h"
-#if defined SK_QUAD_STROKE_APPROXIMATION && defined SK_DEBUG
+#if !defined SK_LEGACY_STROKE_CURVES && defined SK_DEBUG
extern bool gDebugStrokerErrorSet;
extern SkScalar gDebugStrokerError;
extern int gMaxRecursion[];
diff --git a/src/core/SkStrokeRec.cpp b/src/core/SkStrokeRec.cpp
index 2ca7efd703..c7359e51b5 100644
--- a/src/core/SkStrokeRec.cpp
+++ b/src/core/SkStrokeRec.cpp
@@ -100,7 +100,7 @@ void SkStrokeRec::setStrokeStyle(SkScalar width, bool strokeAndFill) {
#include "SkStroke.h"
-#if defined SK_QUAD_STROKE_APPROXIMATION && defined SK_DEBUG
+#if !defined SK_LEGACY_STROKE_CURVES && defined SK_DEBUG
// enables tweaking these values at runtime from SampleApp
bool gDebugStrokerErrorSet = false;
SkScalar gDebugStrokerError;
@@ -117,7 +117,7 @@ bool SkStrokeRec::applyToPath(SkPath* dst, const SkPath& src) const {
stroker.setMiterLimit(fMiterLimit);
stroker.setWidth(fWidth);
stroker.setDoFill(fStrokeAndFill);
-#if defined SK_QUAD_STROKE_APPROXIMATION && defined SK_DEBUG
+#if !defined SK_LEGACY_STROKE_CURVES && defined SK_DEBUG
stroker.setResScale(gDebugStrokerErrorSet ? gDebugStrokerError : fResScale);
#else
stroker.setResScale(fResScale);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 13:10:47 +0000