| Index: Source/core/style/StyleTransformData.cpp
|
| diff --git a/Source/core/style/StyleTransformData.cpp b/Source/core/style/StyleTransformData.cpp
|
| index f9f35a5780f5b2d2499175884d2824d24dfc5b6d..35d59af445d1a7817317aaf7b0a26c615b44f344 100644
|
| --- a/Source/core/style/StyleTransformData.cpp
|
| +++ b/Source/core/style/StyleTransformData.cpp
|
| @@ -21,8 +21,8 @@
|
|
|
| #include "config.h"
|
| #include "core/style/StyleTransformData.h"
|
| -
|
| #include "core/style/ComputedStyle.h"
|
| +#include "core/style/DataEquivalency.h"
|
|
|
| namespace blink {
|
|
|
| @@ -38,12 +38,42 @@ StyleTransformData::StyleTransformData(const StyleTransformData& o)
|
| , m_operations(o.m_operations)
|
| , m_origin(o.m_origin)
|
| , m_motion(o.m_motion)
|
| + , m_translate(o.m_translate)
|
| + , m_rotate(o.m_rotate)
|
| + , m_scale(o.m_scale)
|
| {
|
| }
|
|
|
| bool StyleTransformData::operator==(const StyleTransformData& o) const
|
| {
|
| - return m_origin == o.m_origin && m_operations == o.m_operations && m_motion == o.m_motion;
|
| + return m_origin == o.m_origin
|
| + && m_operations == o.m_operations
|
| + && m_motion == o.m_motion
|
| + && dataEquivalent(m_translate, o.m_translate)
|
| + && dataEquivalent(m_rotate, o.m_rotate)
|
| + && dataEquivalent(m_scale, o.m_scale);
|
| +}
|
| +
|
| +bool StyleTransformData::has3DTransformProperties() const
|
| +{
|
| + return (m_translate && m_translate->is3DOperation())
|
| + || (m_rotate && m_rotate->is3DOperation())
|
| + || (m_scale && m_scale->is3DOperation());
|
| +}
|
| +
|
| +void StyleTransformData::setTranslate(PassRefPtr<TranslateTransformOperation> translate)
|
| +{
|
| + m_translate = translate;
|
| +}
|
| +
|
| +void StyleTransformData::setRotate(PassRefPtr<RotateTransformOperation> rotate)
|
| +{
|
| + m_rotate = rotate;
|
| +}
|
| +
|
| +void StyleTransformData::setScale(PassRefPtr<ScaleTransformOperation> scale)
|
| +{
|
| + m_scale = scale;
|
| }
|
|
|
| } // namespace blink
|
|
|