| OLD | NEW |
| 1 | |
| 2 /* | 1 /* |
| 3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 4 2004, 2005, 2007 Rob Buis <buis@kde.org> | 3 2004, 2005, 2007 Rob Buis <buis@kde.org> |
| 5 Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 6 | 5 |
| 7 Based on khtml code by: | 6 Based on khtml code by: |
| 8 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 9 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) | 8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 10 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) | 9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) |
| 11 Copyright (C) 2002 Apple Computer, Inc. | 10 Copyright (C) 2002 Apple Computer, Inc. |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 150 |
| 152 bool StyleMiscData::operator==(const StyleMiscData& other) const | 151 bool StyleMiscData::operator==(const StyleMiscData& other) const |
| 153 { | 152 { |
| 154 return floodOpacity == other.floodOpacity | 153 return floodOpacity == other.floodOpacity |
| 155 && floodColor == other.floodColor | 154 && floodColor == other.floodColor |
| 156 && lightingColor == other.lightingColor | 155 && lightingColor == other.lightingColor |
| 157 && baselineShiftValue == other.baselineShiftValue; | 156 && baselineShiftValue == other.baselineShiftValue; |
| 158 } | 157 } |
| 159 | 158 |
| 160 StyleResourceData::StyleResourceData() | 159 StyleResourceData::StyleResourceData() |
| 161 : clipPath(SVGComputedStyle::initialClipPath()) | 160 : masker(SVGComputedStyle::initialMaskerResource()) |
| 162 , masker(SVGComputedStyle::initialMaskerResource()) | |
| 163 { | 161 { |
| 164 } | 162 } |
| 165 | 163 |
| 166 StyleResourceData::StyleResourceData(const StyleResourceData& other) | 164 StyleResourceData::StyleResourceData(const StyleResourceData& other) |
| 167 : RefCounted<StyleResourceData>() | 165 : RefCounted<StyleResourceData>() |
| 168 , clipPath(other.clipPath) | |
| 169 , masker(other.masker) | 166 , masker(other.masker) |
| 170 { | 167 { |
| 171 } | 168 } |
| 172 | 169 |
| 173 bool StyleResourceData::operator==(const StyleResourceData& other) const | 170 bool StyleResourceData::operator==(const StyleResourceData& other) const |
| 174 { | 171 { |
| 175 return dataEquivalent(clipPath, other.clipPath) | 172 return masker == other.masker; |
| 176 && masker == other.masker; | |
| 177 } | 173 } |
| 178 | 174 |
| 179 StyleInheritedResourceData::StyleInheritedResourceData() | 175 StyleInheritedResourceData::StyleInheritedResourceData() |
| 180 : markerStart(SVGComputedStyle::initialMarkerStartResource()) | 176 : markerStart(SVGComputedStyle::initialMarkerStartResource()) |
| 181 , markerMid(SVGComputedStyle::initialMarkerMidResource()) | 177 , markerMid(SVGComputedStyle::initialMarkerMidResource()) |
| 182 , markerEnd(SVGComputedStyle::initialMarkerEndResource()) | 178 , markerEnd(SVGComputedStyle::initialMarkerEndResource()) |
| 183 { | 179 { |
| 184 } | 180 } |
| 185 | 181 |
| 186 StyleInheritedResourceData::StyleInheritedResourceData(const StyleInheritedResou
rceData& other) | 182 StyleInheritedResourceData::StyleInheritedResourceData(const StyleInheritedResou
rceData& other) |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 && y == other.y | 230 && y == other.y |
| 235 && r == other.r | 231 && r == other.r |
| 236 && rx == other.rx | 232 && rx == other.rx |
| 237 && ry == other.ry | 233 && ry == other.ry |
| 238 && cx == other.cx | 234 && cx == other.cx |
| 239 && cy == other.cy | 235 && cy == other.cy |
| 240 && dataEquivalent(d, other.d); | 236 && dataEquivalent(d, other.d); |
| 241 } | 237 } |
| 242 | 238 |
| 243 } // namespace blink | 239 } // namespace blink |
| OLD | NEW |