OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
3 2004, 2005, 2007 Rob Buis <buis@kde.org> | 3 2004, 2005, 2007 Rob Buis <buis@kde.org> |
4 Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 Copyright (C) Research In Motion Limited 2010. All rights reserved. |
5 | 5 |
6 Based on khtml code by: | 6 Based on khtml code by: |
7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 7 Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) | 8 Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org) |
9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) | 9 Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org) |
10 Copyright (C) 2002 Apple Computer, Inc. | 10 Copyright (C) 2002 Apple Computer, Inc. |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 } | 194 } |
195 | 195 |
196 bool StyleInheritedResourceData::operator==(const StyleInheritedResourceData& ot
her) const | 196 bool StyleInheritedResourceData::operator==(const StyleInheritedResourceData& ot
her) const |
197 { | 197 { |
198 return markerStart == other.markerStart | 198 return markerStart == other.markerStart |
199 && markerMid == other.markerMid | 199 && markerMid == other.markerMid |
200 && markerEnd == other.markerEnd; | 200 && markerEnd == other.markerEnd; |
201 } | 201 } |
202 | 202 |
203 StyleLayoutData::StyleLayoutData() | 203 StyleLayoutData::StyleLayoutData() |
204 : x(SVGLayoutStyle::initialX()) | 204 : cx(SVGLayoutStyle::initialCx()) |
| 205 , cy(SVGLayoutStyle::initialCy()) |
| 206 , x(SVGLayoutStyle::initialX()) |
205 , y(SVGLayoutStyle::initialY()) | 207 , y(SVGLayoutStyle::initialY()) |
| 208 , r(SVGLayoutStyle::initialR()) |
206 , rx(SVGLayoutStyle::initialRx()) | 209 , rx(SVGLayoutStyle::initialRx()) |
207 , ry(SVGLayoutStyle::initialRy()) | 210 , ry(SVGLayoutStyle::initialRy()) |
208 { | 211 { |
209 } | 212 } |
210 | 213 |
211 inline StyleLayoutData::StyleLayoutData(const StyleLayoutData& other) | 214 inline StyleLayoutData::StyleLayoutData(const StyleLayoutData& other) |
212 : RefCounted<StyleLayoutData>() | 215 : RefCounted<StyleLayoutData>() |
| 216 , cx(other.cx) |
| 217 , cy(other.cy) |
213 , x(other.x) | 218 , x(other.x) |
214 , y(other.y) | 219 , y(other.y) |
| 220 , r(other.r) |
215 , rx(other.rx) | 221 , rx(other.rx) |
216 , ry(other.ry) | 222 , ry(other.ry) |
217 { | 223 { |
218 } | 224 } |
219 | 225 |
220 PassRefPtr<StyleLayoutData> StyleLayoutData::copy() const | 226 PassRefPtr<StyleLayoutData> StyleLayoutData::copy() const |
221 { | 227 { |
222 return adoptRef(new StyleLayoutData(*this)); | 228 return adoptRef(new StyleLayoutData(*this)); |
223 } | 229 } |
224 | 230 |
225 bool StyleLayoutData::operator==(const StyleLayoutData& other) const | 231 bool StyleLayoutData::operator==(const StyleLayoutData& other) const |
226 { | 232 { |
227 return x == other.x | 233 return x == other.x |
228 && y == other.y | 234 && y == other.y |
| 235 && r == other.r |
229 && rx == other.rx | 236 && rx == other.rx |
230 && ry == other.ry; | 237 && ry == other.ry |
| 238 && cx == other.cx |
| 239 && cy == other.cy; |
231 } | 240 } |
232 | 241 |
233 } | 242 } |
OLD | NEW |