remove LEGACY_SVG code, as no one defines that flag anymore.
Bug: skia:
Change-Id: I99929ac992c0f6fd3b09036b6cf3db74a3e4d16d
Reviewed-on: https://skia-review.googlesource.com/158600
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index bfe9cc2..94ed8cc 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -1463,12 +1463,8 @@
pointTransform.setRotate(angle);
pointTransform.preScale(rx, ry);
-#ifdef SK_SUPPORT_LEGACY_SVG_ARC_TO
- int segments = SkScalarCeilToInt(SkScalarAbs(thetaArc / (SK_ScalarPI / 2)));
-#else
// the arc may be slightly bigger than 1/4 circle, so allow up to 1/3rd
int segments = SkScalarCeilToInt(SkScalarAbs(thetaArc / (2 * SK_ScalarPI / 3)));
-#endif
SkScalar thetaWidth = thetaArc / segments;
SkScalar t = SkScalarTan(0.5f * thetaWidth);
if (!SkScalarIsFinite(t)) {
@@ -1476,14 +1472,13 @@
}
SkScalar startTheta = theta1;
SkScalar w = SkScalarSqrt(SK_ScalarHalf + SkScalarCos(thetaWidth) * SK_ScalarHalf);
-#ifndef SK_SUPPORT_LEGACY_SVG_ARC_TO
auto scalar_is_integer = [](SkScalar scalar) -> bool {
return scalar == SkScalarFloorToScalar(scalar);
};
bool expectIntegers = SkScalarNearlyZero(SK_ScalarPI/2 - SkScalarAbs(thetaWidth)) &&
scalar_is_integer(rx) && scalar_is_integer(ry) &&
scalar_is_integer(x) && scalar_is_integer(y);
-#endif
+
for (int i = 0; i < segments; ++i) {
SkScalar endTheta = startTheta + thetaWidth;
SkScalar cosEndTheta, sinEndTheta = SkScalarSinCos(endTheta, &cosEndTheta);
@@ -1499,14 +1494,12 @@
outside their marks. A round rect may lose convexity as a result. If the input
values are on integers, place the conic on integers as well.
*/
-#ifndef SK_SUPPORT_LEGACY_SVG_ARC_TO
if (expectIntegers) {
SkScalar* mappedScalars = &mapped[0].fX;
for (unsigned index = 0; index < sizeof(mapped) / sizeof(SkScalar); ++index) {
mappedScalars[index] = SkScalarRoundToScalar(mappedScalars[index]);
}
}
-#endif
this->conicTo(mapped[0], mapped[1], w);
startTheta = endTheta;
}