Index: Source/core/svg/SVGPathSegListBuilder.cpp |
diff --git a/Source/core/svg/SVGPathSegListBuilder.cpp b/Source/core/svg/SVGPathSegListBuilder.cpp |
index bf79b5463d755c066d658a51ef03e7c175bee0f4..e3ae3856ce79533cc0257b7ef966f6b20d85b540 100644 |
--- a/Source/core/svg/SVGPathSegListBuilder.cpp |
+++ b/Source/core/svg/SVGPathSegListBuilder.cpp |
@@ -52,7 +52,6 @@ namespace blink { |
SVGPathSegListBuilder::SVGPathSegListBuilder() |
: m_pathElement(0) |
, m_pathSegList(nullptr) |
- , m_pathSegRole(PathSegUndefinedRole) |
{ |
} |
@@ -61,9 +60,9 @@ void SVGPathSegListBuilder::moveTo(const FloatPoint& targetPoint, bool, PathCoor |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegMovetoAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegMovetoAbs::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegMovetoRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegMovetoRel::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
} |
void SVGPathSegListBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -71,9 +70,9 @@ void SVGPathSegListBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinate |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoAbs::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoRel::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
} |
void SVGPathSegListBuilder::lineToHorizontal(float x, PathCoordinateMode mode) |
@@ -81,9 +80,9 @@ void SVGPathSegListBuilder::lineToHorizontal(float x, PathCoordinateMode mode) |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoHorizontalAbs::create(m_pathElement, m_pathSegRole, x)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoHorizontalAbs::create(m_pathElement, x)); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoHorizontalRel::create(m_pathElement, m_pathSegRole, x)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoHorizontalRel::create(m_pathElement, x)); |
} |
void SVGPathSegListBuilder::lineToVertical(float y, PathCoordinateMode mode) |
@@ -91,9 +90,9 @@ void SVGPathSegListBuilder::lineToVertical(float y, PathCoordinateMode mode) |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoVerticalAbs::create(m_pathElement, m_pathSegRole, y)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoVerticalAbs::create(m_pathElement, y)); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoVerticalRel::create(m_pathElement, m_pathSegRole, y)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegLinetoVerticalRel::create(m_pathElement, y)); |
} |
void SVGPathSegListBuilder::curveToCubic(const FloatPoint& point1, const FloatPoint& point2, const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -101,9 +100,9 @@ void SVGPathSegListBuilder::curveToCubic(const FloatPoint& point1, const FloatPo |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point1.x(), point1.y(), point2.x(), point2.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicAbs::create(m_pathElement, targetPoint.x(), targetPoint.y(), point1.x(), point1.y(), point2.x(), point2.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point1.x(), point1.y(), point2.x(), point2.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicRel::create(m_pathElement, targetPoint.x(), targetPoint.y(), point1.x(), point1.y(), point2.x(), point2.y())); |
} |
void SVGPathSegListBuilder::curveToCubicSmooth(const FloatPoint& point2, const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -111,9 +110,9 @@ void SVGPathSegListBuilder::curveToCubicSmooth(const FloatPoint& point2, const F |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicSmoothAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point2.x(), point2.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicSmoothAbs::create(m_pathElement, targetPoint.x(), targetPoint.y(), point2.x(), point2.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicSmoothRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point2.x(), point2.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoCubicSmoothRel::create(m_pathElement, targetPoint.x(), targetPoint.y(), point2.x(), point2.y())); |
} |
void SVGPathSegListBuilder::curveToQuadratic(const FloatPoint& point1, const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -121,9 +120,9 @@ void SVGPathSegListBuilder::curveToQuadratic(const FloatPoint& point1, const Flo |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point1.x(), point1.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticAbs::create(m_pathElement, targetPoint.x(), targetPoint.y(), point1.x(), point1.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), point1.x(), point1.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticRel::create(m_pathElement, targetPoint.x(), targetPoint.y(), point1.x(), point1.y())); |
} |
void SVGPathSegListBuilder::curveToQuadraticSmooth(const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -131,9 +130,9 @@ void SVGPathSegListBuilder::curveToQuadraticSmooth(const FloatPoint& targetPoint |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticSmoothAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticSmoothAbs::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticSmoothRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y())); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegCurvetoQuadraticSmoothRel::create(m_pathElement, targetPoint.x(), targetPoint.y())); |
} |
void SVGPathSegListBuilder::arcTo(float r1, float r2, float angle, bool largeArcFlag, bool sweepFlag, const FloatPoint& targetPoint, PathCoordinateMode mode) |
@@ -141,16 +140,16 @@ void SVGPathSegListBuilder::arcTo(float r1, float r2, float angle, bool largeArc |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
if (mode == AbsoluteCoordinates) |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegArcAbs::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), r1, r2, angle, largeArcFlag, sweepFlag)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegArcAbs::create(m_pathElement, targetPoint.x(), targetPoint.y(), r1, r2, angle, largeArcFlag, sweepFlag)); |
else |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegArcRel::create(m_pathElement, m_pathSegRole, targetPoint.x(), targetPoint.y(), r1, r2, angle, largeArcFlag, sweepFlag)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegArcRel::create(m_pathElement, targetPoint.x(), targetPoint.y(), r1, r2, angle, largeArcFlag, sweepFlag)); |
} |
void SVGPathSegListBuilder::closePath() |
{ |
ASSERT(m_pathElement); |
ASSERT(m_pathSegList); |
- m_pathSegList->appendWithoutByteStreamSync(SVGPathSegClosePath::create(m_pathElement, m_pathSegRole)); |
+ m_pathSegList->appendWithoutByteStreamSync(SVGPathSegClosePath::create(m_pathElement)); |
} |
} |