| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 return opacity == other.opacity && paintType == other.paintType && | 55 return opacity == other.opacity && paintType == other.paintType && |
| 56 paintColor == other.paintColor && paintUri == other.paintUri && | 56 paintColor == other.paintColor && paintUri == other.paintUri && |
| 57 visitedLinkPaintType == other.visitedLinkPaintType && | 57 visitedLinkPaintType == other.visitedLinkPaintType && |
| 58 visitedLinkPaintColor == other.visitedLinkPaintColor && | 58 visitedLinkPaintColor == other.visitedLinkPaintColor && |
| 59 visitedLinkPaintUri == other.visitedLinkPaintUri; | 59 visitedLinkPaintUri == other.visitedLinkPaintUri; |
| 60 } | 60 } |
| 61 | 61 |
| 62 StyleStrokeData::StyleStrokeData() | 62 StyleStrokeData::StyleStrokeData() |
| 63 : opacity(SVGComputedStyle::initialStrokeOpacity()), | 63 : opacity(SVGComputedStyle::initialStrokeOpacity()), |
| 64 miterLimit(SVGComputedStyle::initialStrokeMiterLimit()), | 64 miterLimit(SVGComputedStyle::initialStrokeMiterLimit()), |
| 65 width(SVGComputedStyle::initialStrokeWidth()), | |
| 66 dashOffset(SVGComputedStyle::initialStrokeDashOffset()), | 65 dashOffset(SVGComputedStyle::initialStrokeDashOffset()), |
| 67 dashArray(SVGComputedStyle::initialStrokeDashArray()), | 66 dashArray(SVGComputedStyle::initialStrokeDashArray()), |
| 68 paintType(SVGComputedStyle::initialStrokePaintType()), | 67 paintType(SVGComputedStyle::initialStrokePaintType()), |
| 69 paintColor(SVGComputedStyle::initialStrokePaintColor()), | 68 paintColor(SVGComputedStyle::initialStrokePaintColor()), |
| 70 paintUri(SVGComputedStyle::initialStrokePaintUri()), | 69 paintUri(SVGComputedStyle::initialStrokePaintUri()), |
| 71 visitedLinkPaintType(SVGComputedStyle::initialStrokePaintType()), | 70 visitedLinkPaintType(SVGComputedStyle::initialStrokePaintType()), |
| 72 visitedLinkPaintColor(SVGComputedStyle::initialStrokePaintColor()), | 71 visitedLinkPaintColor(SVGComputedStyle::initialStrokePaintColor()), |
| 73 visitedLinkPaintUri(SVGComputedStyle::initialStrokePaintUri()) {} | 72 visitedLinkPaintUri(SVGComputedStyle::initialStrokePaintUri()) {} |
| 74 | 73 |
| 75 StyleStrokeData::StyleStrokeData(const StyleStrokeData& other) | 74 StyleStrokeData::StyleStrokeData(const StyleStrokeData& other) |
| 76 : RefCounted<StyleStrokeData>(), | 75 : RefCounted<StyleStrokeData>(), |
| 77 opacity(other.opacity), | 76 opacity(other.opacity), |
| 78 miterLimit(other.miterLimit), | 77 miterLimit(other.miterLimit), |
| 79 width(other.width), | |
| 80 dashOffset(other.dashOffset), | 78 dashOffset(other.dashOffset), |
| 81 dashArray(other.dashArray), | 79 dashArray(other.dashArray), |
| 82 paintType(other.paintType), | 80 paintType(other.paintType), |
| 83 paintColor(other.paintColor), | 81 paintColor(other.paintColor), |
| 84 paintUri(other.paintUri), | 82 paintUri(other.paintUri), |
| 85 visitedLinkPaintType(other.visitedLinkPaintType), | 83 visitedLinkPaintType(other.visitedLinkPaintType), |
| 86 visitedLinkPaintColor(other.visitedLinkPaintColor), | 84 visitedLinkPaintColor(other.visitedLinkPaintColor), |
| 87 visitedLinkPaintUri(other.visitedLinkPaintUri) {} | 85 visitedLinkPaintUri(other.visitedLinkPaintUri) {} |
| 88 | 86 |
| 89 bool StyleStrokeData::operator==(const StyleStrokeData& other) const { | 87 bool StyleStrokeData::operator==(const StyleStrokeData& other) const { |
| 90 return width == other.width && opacity == other.opacity && | 88 return opacity == other.opacity && miterLimit == other.miterLimit && |
| 91 miterLimit == other.miterLimit && dashOffset == other.dashOffset && | 89 dashOffset == other.dashOffset && *dashArray == *other.dashArray && |
| 92 *dashArray == *other.dashArray && paintType == other.paintType && | 90 paintType == other.paintType && paintColor == other.paintColor && |
| 93 paintColor == other.paintColor && paintUri == other.paintUri && | 91 paintUri == other.paintUri && |
| 94 visitedLinkPaintType == other.visitedLinkPaintType && | 92 visitedLinkPaintType == other.visitedLinkPaintType && |
| 95 visitedLinkPaintColor == other.visitedLinkPaintColor && | 93 visitedLinkPaintColor == other.visitedLinkPaintColor && |
| 96 visitedLinkPaintUri == other.visitedLinkPaintUri; | 94 visitedLinkPaintUri == other.visitedLinkPaintUri; |
| 97 } | 95 } |
| 98 | 96 |
| 99 StyleStopData::StyleStopData() | 97 StyleStopData::StyleStopData() |
| 100 : opacity(SVGComputedStyle::initialStopOpacity()), | 98 : opacity(SVGComputedStyle::initialStopOpacity()), |
| 101 color(SVGComputedStyle::initialStopColor()) {} | 99 color(SVGComputedStyle::initialStopColor()) {} |
| 102 | 100 |
| 103 StyleStopData::StyleStopData(const StyleStopData& other) | 101 StyleStopData::StyleStopData(const StyleStopData& other) |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 return adoptRef(new StyleGeometryData(*this)); | 177 return adoptRef(new StyleGeometryData(*this)); |
| 180 } | 178 } |
| 181 | 179 |
| 182 bool StyleGeometryData::operator==(const StyleGeometryData& other) const { | 180 bool StyleGeometryData::operator==(const StyleGeometryData& other) const { |
| 183 return x == other.x && y == other.y && r == other.r && rx == other.rx && | 181 return x == other.x && y == other.y && r == other.r && rx == other.rx && |
| 184 ry == other.ry && cx == other.cx && cy == other.cy && | 182 ry == other.ry && cx == other.cx && cy == other.cy && |
| 185 dataEquivalent(d, other.d); | 183 dataEquivalent(d, other.d); |
| 186 } | 184 } |
| 187 | 185 |
| 188 } // namespace blink | 186 } // namespace blink |
| OLD | NEW |