| 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, 2010 Rob Buis <buis@kde.org> | 3 2004, 2005, 2010 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 || stroke->paintUri != other->stroke->paintUri | 180 || stroke->paintUri != other->stroke->paintUri |
| 181 || stroke->miterLimit != other->stroke->miterLimit | 181 || stroke->miterLimit != other->stroke->miterLimit |
| 182 || *stroke->dashArray != *other->stroke->dashArray | 182 || *stroke->dashArray != *other->stroke->dashArray |
| 183 || stroke->dashOffset != other->stroke->dashOffset | 183 || stroke->dashOffset != other->stroke->dashOffset |
| 184 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor | 184 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor |
| 185 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri | 185 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri |
| 186 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) | 186 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) |
| 187 return true; | 187 return true; |
| 188 } | 188 } |
| 189 | 189 |
| 190 // The x, y, rx and ry properties require a re-layout. | 190 // The StyleLayoutData properties require a re-layout. |
| 191 if (layout.get() != other->layout.get()) { | 191 if (layout.get() != other->layout.get()) { |
| 192 if (layout->x != other->layout->x | 192 if (layout->x != other->layout->x |
| 193 || layout->y != other->layout->y | 193 || layout->y != other->layout->y |
| 194 || layout->r != other->layout->r | 194 || layout->r != other->layout->r |
| 195 || layout->rx != other->layout->rx | 195 || layout->rx != other->layout->rx |
| 196 || layout->ry != other->layout->ry | 196 || layout->ry != other->layout->ry |
| 197 || layout->cx != other->layout->cx | 197 || layout->cx != other->layout->cx |
| 198 || layout->cy != other->layout->cy) | 198 || layout->cy != other->layout->cy |
| 199 || !layout->d->equals(*other->layout->d)) |
| 199 return true; | 200 return true; |
| 200 } | 201 } |
| 201 | 202 |
| 202 return false; | 203 return false; |
| 203 } | 204 } |
| 204 | 205 |
| 205 bool SVGComputedStyle::diffNeedsPaintInvalidation(const SVGComputedStyle* other)
const | 206 bool SVGComputedStyle::diffNeedsPaintInvalidation(const SVGComputedStyle* other)
const |
| 206 { | 207 { |
| 207 if (stroke->opacity != other->stroke->opacity) | 208 if (stroke->opacity != other->stroke->opacity) |
| 208 return true; | 209 return true; |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 case PaintOrderMarkersStrokeFill: | 277 case PaintOrderMarkersStrokeFill: |
| 277 pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL); | 278 pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL); |
| 278 break; | 279 break; |
| 279 } | 280 } |
| 280 | 281 |
| 281 pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1)
; | 282 pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1)
; |
| 282 return (EPaintOrderType)pt; | 283 return (EPaintOrderType)pt; |
| 283 } | 284 } |
| 284 | 285 |
| 285 } | 286 } |
| OLD | NEW |