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