| Index: third_party/WebKit/Source/core/svg/SVGTransform.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGTransform.cpp b/third_party/WebKit/Source/core/svg/SVGTransform.cpp
|
| index 90bdc3691953961e1e43ee30ff949998293bb062..8e468bd6fee31a5d5eb63e45cd186eda74a24224 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGTransform.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/SVGTransform.cpp
|
| @@ -28,7 +28,7 @@
|
| namespace blink {
|
|
|
| SVGTransform::SVGTransform()
|
| - : m_transformType(SVG_TRANSFORM_UNKNOWN)
|
| + : m_transformType(kSvgTransformUnknown)
|
| , m_angle(0)
|
| {
|
| }
|
| @@ -42,7 +42,7 @@ SVGTransform::SVGTransform(SVGTransformType transformType, ConstructionMode mode
|
| }
|
|
|
| SVGTransform::SVGTransform(const AffineTransform& matrix)
|
| - : m_transformType(SVG_TRANSFORM_MATRIX)
|
| + : m_transformType(kSvgTransformMatrix)
|
| , m_angle(0)
|
| , m_matrix(matrix)
|
| {
|
| @@ -80,13 +80,13 @@ void SVGTransform::setMatrix(const AffineTransform& matrix)
|
|
|
| void SVGTransform::onMatrixChange()
|
| {
|
| - m_transformType = SVG_TRANSFORM_MATRIX;
|
| + m_transformType = kSvgTransformMatrix;
|
| m_angle = 0;
|
| }
|
|
|
| void SVGTransform::setTranslate(float tx, float ty)
|
| {
|
| - m_transformType = SVG_TRANSFORM_TRANSLATE;
|
| + m_transformType = kSvgTransformTranslate;
|
| m_angle = 0;
|
|
|
| m_matrix.makeIdentity();
|
| @@ -100,7 +100,7 @@ FloatPoint SVGTransform::translate() const
|
|
|
| void SVGTransform::setScale(float sx, float sy)
|
| {
|
| - m_transformType = SVG_TRANSFORM_SCALE;
|
| + m_transformType = kSvgTransformScale;
|
| m_angle = 0;
|
| m_center = FloatPoint();
|
|
|
| @@ -115,7 +115,7 @@ FloatSize SVGTransform::scale() const
|
|
|
| void SVGTransform::setRotate(float angle, float cx, float cy)
|
| {
|
| - m_transformType = SVG_TRANSFORM_ROTATE;
|
| + m_transformType = kSvgTransformRotate;
|
| m_angle = angle;
|
| m_center = FloatPoint(cx, cy);
|
|
|
| @@ -128,7 +128,7 @@ void SVGTransform::setRotate(float angle, float cx, float cy)
|
|
|
| void SVGTransform::setSkewX(float angle)
|
| {
|
| - m_transformType = SVG_TRANSFORM_SKEWX;
|
| + m_transformType = kSvgTransformSkewx;
|
| m_angle = angle;
|
|
|
| m_matrix.makeIdentity();
|
| @@ -137,7 +137,7 @@ void SVGTransform::setSkewX(float angle)
|
|
|
| void SVGTransform::setSkewY(float angle)
|
| {
|
| - m_transformType = SVG_TRANSFORM_SKEWY;
|
| + m_transformType = kSvgTransformSkewy;
|
| m_angle = angle;
|
|
|
| m_matrix.makeIdentity();
|
| @@ -149,19 +149,19 @@ namespace {
|
| const char* transformTypePrefixForParsing(SVGTransformType type)
|
| {
|
| switch (type) {
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return "";
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| return "matrix(";
|
| - case SVG_TRANSFORM_TRANSLATE:
|
| + case kSvgTransformTranslate:
|
| return "translate(";
|
| - case SVG_TRANSFORM_SCALE:
|
| + case kSvgTransformScale:
|
| return "scale(";
|
| - case SVG_TRANSFORM_ROTATE:
|
| + case kSvgTransformRotate:
|
| return "rotate(";
|
| - case SVG_TRANSFORM_SKEWX:
|
| + case kSvgTransformSkewx:
|
| return "skewX(";
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewy:
|
| return "skewY(";
|
| }
|
| ASSERT_NOT_REACHED();
|
| @@ -175,9 +175,9 @@ String SVGTransform::valueAsString() const
|
| double arguments[6];
|
| size_t argumentCount = 0;
|
| switch (m_transformType) {
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return emptyString();
|
| - case SVG_TRANSFORM_MATRIX: {
|
| + case kSvgTransformMatrix: {
|
| arguments[argumentCount++] = m_matrix.a();
|
| arguments[argumentCount++] = m_matrix.b();
|
| arguments[argumentCount++] = m_matrix.c();
|
| @@ -186,17 +186,17 @@ String SVGTransform::valueAsString() const
|
| arguments[argumentCount++] = m_matrix.f();
|
| break;
|
| }
|
| - case SVG_TRANSFORM_TRANSLATE: {
|
| + case kSvgTransformTranslate: {
|
| arguments[argumentCount++] = m_matrix.e();
|
| arguments[argumentCount++] = m_matrix.f();
|
| break;
|
| }
|
| - case SVG_TRANSFORM_SCALE: {
|
| + case kSvgTransformScale: {
|
| arguments[argumentCount++] = m_matrix.a();
|
| arguments[argumentCount++] = m_matrix.d();
|
| break;
|
| }
|
| - case SVG_TRANSFORM_ROTATE: {
|
| + case kSvgTransformRotate: {
|
| arguments[argumentCount++] = m_angle;
|
|
|
| double angleInRad = deg2rad(m_angle);
|
| @@ -210,10 +210,10 @@ String SVGTransform::valueAsString() const
|
| }
|
| break;
|
| }
|
| - case SVG_TRANSFORM_SKEWX:
|
| + case kSvgTransformSkewx:
|
| arguments[argumentCount++] = m_angle;
|
| break;
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewy:
|
| arguments[argumentCount++] = m_angle;
|
| break;
|
| }
|
|
|