| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 
| 3  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 
| 4  * | 4  * | 
| 5  * This library is free software; you can redistribute it and/or | 5  * This library is free software; you can redistribute it and/or | 
| 6  * modify it under the terms of the GNU Library General Public | 6  * modify it under the terms of the GNU Library General Public | 
| 7  * License as published by the Free Software Foundation; either | 7  * License as published by the Free Software Foundation; either | 
| 8  * version 2 of the License, or (at your option) any later version. | 8  * version 2 of the License, or (at your option) any later version. | 
| 9  * | 9  * | 
| 10  * This library is distributed in the hope that it will be useful, | 10  * This library is distributed in the hope that it will be useful, | 
| 11  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 12  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 
| 13  * Library General Public License for more details. | 13  * Library General Public License for more details. | 
| 14  * | 14  * | 
| 15  * You should have received a copy of the GNU Library General Public License | 15  * You should have received a copy of the GNU Library General Public License | 
| 16  * along with this library; see the file COPYING.LIB.  If not, write to | 16  * along with this library; see the file COPYING.LIB.  If not, write to | 
| 17  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 
| 18  * Boston, MA 02110-1301, USA. | 18  * Boston, MA 02110-1301, USA. | 
| 19  * | 19  * | 
| 20  */ | 20  */ | 
| 21 | 21 | 
| 22 #include "config.h" | 22 #include "config.h" | 
| 23 #include "core/style/StyleTransformData.h" | 23 #include "core/style/StyleTransformData.h" | 
| 24 | 24 | 
| 25 #include "core/style/ComputedStyle.h" | 25 #include "core/style/ComputedStyle.h" | 
|  | 26 #include "core/style/DataEquivalency.h" | 
| 26 | 27 | 
| 27 namespace blink { | 28 namespace blink { | 
| 28 | 29 | 
| 29 StyleTransformData::StyleTransformData() | 30 StyleTransformData::StyleTransformData() | 
| 30     : m_operations(ComputedStyle::initialTransform()) | 31     : m_operations(ComputedStyle::initialTransform()) | 
| 31     , m_origin(ComputedStyle::initialTransformOrigin()) | 32     , m_origin(ComputedStyle::initialTransformOrigin()) | 
| 32     , m_motion(nullptr, ComputedStyle::initialMotionOffset(), ComputedStyle::ini
    tialMotionRotation(), ComputedStyle::initialMotionRotationType()) | 33     , m_motion(nullptr, ComputedStyle::initialMotionOffset(), ComputedStyle::ini
    tialMotionRotation(), ComputedStyle::initialMotionRotationType()) | 
| 33 { | 34 { | 
| 34 } | 35 } | 
| 35 | 36 | 
| 36 StyleTransformData::StyleTransformData(const StyleTransformData& o) | 37 StyleTransformData::StyleTransformData(const StyleTransformData& o) | 
| 37     : RefCounted<StyleTransformData>() | 38     : RefCounted<StyleTransformData>() | 
| 38     , m_operations(o.m_operations) | 39     , m_operations(o.m_operations) | 
| 39     , m_origin(o.m_origin) | 40     , m_origin(o.m_origin) | 
| 40     , m_motion(o.m_motion) | 41     , m_motion(o.m_motion) | 
|  | 42     , m_translate(o.m_translate) | 
|  | 43     , m_rotate(o.m_rotate) | 
|  | 44     , m_scale(o.m_scale) | 
| 41 { | 45 { | 
| 42 } | 46 } | 
| 43 | 47 | 
| 44 bool StyleTransformData::operator==(const StyleTransformData& o) const | 48 bool StyleTransformData::operator==(const StyleTransformData& o) const | 
| 45 { | 49 { | 
| 46     return m_origin == o.m_origin && m_operations == o.m_operations && m_motion 
    == o.m_motion; | 50     return m_origin == o.m_origin | 
|  | 51         && m_operations == o.m_operations | 
|  | 52         && m_motion == o.m_motion | 
|  | 53         && dataEquivalent<TransformOperation>(m_translate, o.m_translate) | 
|  | 54         && dataEquivalent<TransformOperation>(m_rotate, o.m_rotate) | 
|  | 55         && dataEquivalent<TransformOperation>(m_scale, o.m_scale); | 
|  | 56 } | 
|  | 57 | 
|  | 58 bool StyleTransformData::has3DTransform() const | 
|  | 59 { | 
|  | 60     return m_operations.has3DOperation() | 
|  | 61         || (m_translate && m_translate->z() != 0) | 
|  | 62         || (m_rotate && (m_rotate->x() != 0 || m_rotate->y() != 0)) | 
|  | 63         || (m_scale && m_scale->z() != 1); | 
| 47 } | 64 } | 
| 48 | 65 | 
| 49 } // namespace blink | 66 } // namespace blink | 
| OLD | NEW | 
|---|