Chromium Code Reviews| Index: Source/core/style/StyleTransformData.cpp |
| diff --git a/Source/core/style/StyleTransformData.cpp b/Source/core/style/StyleTransformData.cpp |
| index f9f35a5780f5b2d2499175884d2824d24dfc5b6d..ab32ea1728d401d26eed96b960324d04b7b538bb 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->z() != 0) |
|
dstockwell
2015/06/12 00:17:58
Why doesn't this care about m_operations?
soonm
2015/06/12 01:54:13
I wanted to separate the 3D checks for 'transform'
|
| + || (m_rotate && (m_rotate->x() != 0 || m_rotate->y() != 0 || m_rotate->z() != 1)) |
| + || (m_scale && m_scale->z() != 1); |
| +} |
| + |
| +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 |