Index: Source/platform/transforms/TranslateTransformOperation.cpp |
diff --git a/Source/platform/transforms/TranslateTransformOperation.cpp b/Source/platform/transforms/TranslateTransformOperation.cpp |
index 731bb886a5ecb44505a7109af53fbd9d5cdfdbd4..d45659636d35f753b31d85fc2763cfb2d2205a65 100644 |
--- a/Source/platform/transforms/TranslateTransformOperation.cpp |
+++ b/Source/platform/transforms/TranslateTransformOperation.cpp |
@@ -22,7 +22,7 @@ |
#include "config.h" |
#include "platform/transforms/TranslateTransformOperation.h" |
-namespace WebCore { |
+namespace blink { |
PassRefPtr<TransformOperation> TranslateTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity) |
{ |
@@ -31,13 +31,13 @@ PassRefPtr<TransformOperation> TranslateTransformOperation::blend(const Transfor |
const Length zeroLength(0, Fixed); |
if (blendToIdentity) |
- return TranslateTransformOperation::create(zeroLength.blend(m_x, progress, ValueRangeAll), zeroLength.blend(m_y, progress, ValueRangeAll), WebCore::blend(0., m_z, progress), m_type); |
+ return TranslateTransformOperation::create(zeroLength.blend(m_x, progress, ValueRangeAll), zeroLength.blend(m_y, progress, ValueRangeAll), blink::blend(0., m_z, progress), m_type); |
const TranslateTransformOperation* fromOp = static_cast<const TranslateTransformOperation*>(from); |
Length fromX = fromOp ? fromOp->m_x : zeroLength; |
Length fromY = fromOp ? fromOp->m_y : zeroLength; |
double fromZ = fromOp ? fromOp->m_z : 0; |
- return TranslateTransformOperation::create(m_x.blend(fromX, progress, ValueRangeAll), m_y.blend(fromY, progress, ValueRangeAll), WebCore::blend(fromZ, m_z, progress), m_type); |
+ return TranslateTransformOperation::create(m_x.blend(fromX, progress, ValueRangeAll), m_y.blend(fromY, progress, ValueRangeAll), blink::blend(fromZ, m_z, progress), m_type); |
} |
bool TranslateTransformOperation::canBlendWith(const TransformOperation& other) const |
@@ -49,4 +49,4 @@ bool TranslateTransformOperation::canBlendWith(const TransformOperation& other) |
|| other.type() == Translate3D; |
} |
-} // namespace WebCore |
+} // namespace blink |