| Index: Source/platform/transforms/SkewTransformOperation.cpp
|
| diff --git a/Source/platform/transforms/SkewTransformOperation.cpp b/Source/platform/transforms/SkewTransformOperation.cpp
|
| index 812ea32336700b5b99b20437486218e062629c4c..abb544a2f81c430fabef9414138fdcc33c2ea123 100644
|
| --- a/Source/platform/transforms/SkewTransformOperation.cpp
|
| +++ b/Source/platform/transforms/SkewTransformOperation.cpp
|
| @@ -24,7 +24,7 @@
|
|
|
| #include "platform/animation/AnimationUtilities.h"
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
|
|
| PassRefPtr<TransformOperation> SkewTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity)
|
| {
|
| @@ -32,12 +32,12 @@ PassRefPtr<TransformOperation> SkewTransformOperation::blend(const TransformOper
|
| return this;
|
|
|
| if (blendToIdentity)
|
| - return SkewTransformOperation::create(WebCore::blend(m_angleX, 0.0, progress), WebCore::blend(m_angleY, 0.0, progress), m_type);
|
| + return SkewTransformOperation::create(blink::blend(m_angleX, 0.0, progress), blink::blend(m_angleY, 0.0, progress), m_type);
|
|
|
| const SkewTransformOperation* fromOp = static_cast<const SkewTransformOperation*>(from);
|
| double fromAngleX = fromOp ? fromOp->m_angleX : 0;
|
| double fromAngleY = fromOp ? fromOp->m_angleY : 0;
|
| - return SkewTransformOperation::create(WebCore::blend(fromAngleX, m_angleX, progress), WebCore::blend(fromAngleY, m_angleY, progress), m_type);
|
| + return SkewTransformOperation::create(blink::blend(fromAngleX, m_angleX, progress), blink::blend(fromAngleY, m_angleY, progress), m_type);
|
| }
|
|
|
| bool SkewTransformOperation::canBlendWith(const TransformOperation& other) const
|
| @@ -47,4 +47,4 @@ bool SkewTransformOperation::canBlendWith(const TransformOperation& other) const
|
| || other.type() == SkewY;
|
| }
|
|
|
| -} // namespace WebCore
|
| +} // namespace blink
|
|
|