| Index: third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp b/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp
|
| index b45cec262e2b402f42955b066e0cee2054ef48da..54f1befb390c7789678123baa915ac00f26c2439 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/SVGTransformDistance.cpp
|
| @@ -26,7 +26,7 @@
|
| namespace blink {
|
|
|
| SVGTransformDistance::SVGTransformDistance()
|
| - : m_transformType(SVG_TRANSFORM_UNKNOWN)
|
| + : m_transformType(kSvgTransformUnknown)
|
| , m_angle(0)
|
| , m_cx(0)
|
| , m_cy(0)
|
| @@ -51,30 +51,30 @@ SVGTransformDistance::SVGTransformDistance(SVGTransform* fromSVGTransform, SVGTr
|
| ASSERT(m_transformType == toSVGTransform->transformType());
|
|
|
| switch (m_transformType) {
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| ASSERT_NOT_REACHED();
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| break;
|
| - case SVG_TRANSFORM_ROTATE: {
|
| + case kSvgTransformRotate: {
|
| FloatSize centerDistance = toSVGTransform->rotationCenter() - fromSVGTransform->rotationCenter();
|
| m_angle = toSVGTransform->angle() - fromSVGTransform->angle();
|
| m_cx = centerDistance.width();
|
| m_cy = centerDistance.height();
|
| break;
|
| }
|
| - case SVG_TRANSFORM_TRANSLATE: {
|
| + case kSvgTransformTranslate: {
|
| FloatSize translationDistance = toSVGTransform->translate() - fromSVGTransform->translate();
|
| m_transform.translate(translationDistance.width(), translationDistance.height());
|
| break;
|
| }
|
| - case SVG_TRANSFORM_SCALE: {
|
| + case kSvgTransformScale: {
|
| float scaleX = toSVGTransform->scale().width() - fromSVGTransform->scale().width();
|
| float scaleY = toSVGTransform->scale().height() - fromSVGTransform->scale().height();
|
| m_transform.scaleNonUniform(scaleX, scaleY);
|
| break;
|
| }
|
| - case SVG_TRANSFORM_SKEWX:
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewx:
|
| + case kSvgTransformSkewy:
|
| m_angle = toSVGTransform->angle() - fromSVGTransform->angle();
|
| break;
|
| }
|
| @@ -83,22 +83,22 @@ SVGTransformDistance::SVGTransformDistance(SVGTransform* fromSVGTransform, SVGTr
|
| SVGTransformDistance SVGTransformDistance::scaledDistance(float scaleFactor) const
|
| {
|
| switch (m_transformType) {
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| ASSERT_NOT_REACHED();
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return SVGTransformDistance();
|
| - case SVG_TRANSFORM_ROTATE:
|
| + case kSvgTransformRotate:
|
| return SVGTransformDistance(m_transformType, m_angle * scaleFactor, m_cx * scaleFactor, m_cy * scaleFactor, AffineTransform());
|
| - case SVG_TRANSFORM_SCALE:
|
| + case kSvgTransformScale:
|
| return SVGTransformDistance(m_transformType, m_angle * scaleFactor, m_cx * scaleFactor, m_cy * scaleFactor, AffineTransform(m_transform).scale(scaleFactor));
|
| - case SVG_TRANSFORM_TRANSLATE: {
|
| + case kSvgTransformTranslate: {
|
| AffineTransform newTransform(m_transform);
|
| newTransform.setE(m_transform.e() * scaleFactor);
|
| newTransform.setF(m_transform.f() * scaleFactor);
|
| return SVGTransformDistance(m_transformType, 0, 0, 0, newTransform);
|
| }
|
| - case SVG_TRANSFORM_SKEWX:
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewx:
|
| + case kSvgTransformSkewy:
|
| return SVGTransformDistance(m_transformType, m_angle * scaleFactor, m_cx * scaleFactor, m_cy * scaleFactor, AffineTransform());
|
| }
|
|
|
| @@ -113,31 +113,31 @@ SVGTransform* SVGTransformDistance::addSVGTransforms(SVGTransform* first, SVGTra
|
| SVGTransform* transform = SVGTransform::create();
|
|
|
| switch (first->transformType()) {
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| ASSERT_NOT_REACHED();
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return transform;
|
| - case SVG_TRANSFORM_ROTATE: {
|
| + case kSvgTransformRotate: {
|
| transform->setRotate(first->angle() + second->angle() * repeatCount, first->rotationCenter().x() + second->rotationCenter().x() * repeatCount, first->rotationCenter().y() + second->rotationCenter().y() * repeatCount);
|
| return transform;
|
| }
|
| - case SVG_TRANSFORM_TRANSLATE: {
|
| + case kSvgTransformTranslate: {
|
| float dx = first->translate().x() + second->translate().x() * repeatCount;
|
| float dy = first->translate().y() + second->translate().y() * repeatCount;
|
| transform->setTranslate(dx, dy);
|
| return transform;
|
| }
|
| - case SVG_TRANSFORM_SCALE: {
|
| + case kSvgTransformScale: {
|
| FloatSize scale = second->scale();
|
| scale.scale(repeatCount);
|
| scale += first->scale();
|
| transform->setScale(scale.width(), scale.height());
|
| return transform;
|
| }
|
| - case SVG_TRANSFORM_SKEWX:
|
| + case kSvgTransformSkewx:
|
| transform->setSkewX(first->angle() + second->angle() * repeatCount);
|
| return transform;
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewy:
|
| transform->setSkewY(first->angle() + second->angle() * repeatCount);
|
| return transform;
|
| }
|
| @@ -147,36 +147,36 @@ SVGTransform* SVGTransformDistance::addSVGTransforms(SVGTransform* first, SVGTra
|
|
|
| SVGTransform* SVGTransformDistance::addToSVGTransform(SVGTransform* transform) const
|
| {
|
| - ASSERT(m_transformType == transform->transformType() || m_transformType == SVG_TRANSFORM_UNKNOWN);
|
| + DCHECK(m_transformType == transform->transformType() || m_transformType == kSvgTransformUnknown);
|
|
|
| SVGTransform* newTransform = transform->clone();
|
|
|
| switch (m_transformType) {
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| ASSERT_NOT_REACHED();
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return SVGTransform::create();
|
| - case SVG_TRANSFORM_TRANSLATE: {
|
| + case kSvgTransformTranslate: {
|
| FloatPoint translation = transform->translate();
|
| translation += FloatSize::narrowPrecision(m_transform.e(), m_transform.f());
|
| newTransform->setTranslate(translation.x(), translation.y());
|
| return newTransform;
|
| }
|
| - case SVG_TRANSFORM_SCALE: {
|
| + case kSvgTransformScale: {
|
| FloatSize scale = transform->scale();
|
| scale += FloatSize::narrowPrecision(m_transform.a(), m_transform.d());
|
| newTransform->setScale(scale.width(), scale.height());
|
| return newTransform;
|
| }
|
| - case SVG_TRANSFORM_ROTATE: {
|
| + case kSvgTransformRotate: {
|
| FloatPoint center = transform->rotationCenter();
|
| newTransform->setRotate(transform->angle() + m_angle, center.x() + m_cx, center.y() + m_cy);
|
| return newTransform;
|
| }
|
| - case SVG_TRANSFORM_SKEWX:
|
| + case kSvgTransformSkewx:
|
| newTransform->setSkewX(transform->angle() + m_angle);
|
| return newTransform;
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewy:
|
| newTransform->setSkewY(transform->angle() + m_angle);
|
| return newTransform;
|
| }
|
| @@ -188,18 +188,18 @@ SVGTransform* SVGTransformDistance::addToSVGTransform(SVGTransform* transform) c
|
| float SVGTransformDistance::distance() const
|
| {
|
| switch (m_transformType) {
|
| - case SVG_TRANSFORM_MATRIX:
|
| + case kSvgTransformMatrix:
|
| ASSERT_NOT_REACHED();
|
| - case SVG_TRANSFORM_UNKNOWN:
|
| + case kSvgTransformUnknown:
|
| return 0;
|
| - case SVG_TRANSFORM_ROTATE:
|
| + case kSvgTransformRotate:
|
| return sqrtf(m_angle * m_angle + m_cx * m_cx + m_cy * m_cy);
|
| - case SVG_TRANSFORM_SCALE:
|
| + case kSvgTransformScale:
|
| return static_cast<float>(sqrt(m_transform.a() * m_transform.a() + m_transform.d() * m_transform.d()));
|
| - case SVG_TRANSFORM_TRANSLATE:
|
| + case kSvgTransformTranslate:
|
| return static_cast<float>(sqrt(m_transform.e() * m_transform.e() + m_transform.f() * m_transform.f()));
|
| - case SVG_TRANSFORM_SKEWX:
|
| - case SVG_TRANSFORM_SKEWY:
|
| + case kSvgTransformSkewx:
|
| + case kSvgTransformSkewy:
|
| return m_angle;
|
| }
|
| ASSERT_NOT_REACHED();
|
|
|