| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle | 168 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle |
| 169 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty
le) | 169 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty
le) |
| 170 return true; | 170 return true; |
| 171 | 171 |
| 172 // vector-effect changes require a re-layout. | 172 // vector-effect changes require a re-layout. |
| 173 if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.
f._vectorEffect) | 173 if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.
f._vectorEffect) |
| 174 return true; | 174 return true; |
| 175 | 175 |
| 176 // Some stroke properties, requires relayouts, as the cached stroke boundari
es need to be recalculated. | 176 // Some stroke properties, requires relayouts, as the cached stroke boundari
es need to be recalculated. |
| 177 if (stroke.get() != other->stroke.get()) { | 177 if (stroke.get() != other->stroke.get()) { |
| 178 if (*stroke->width != *other->stroke->width | 178 if (stroke->width != other->stroke->width |
| 179 || stroke->paintType != other->stroke->paintType | 179 || stroke->paintType != other->stroke->paintType |
| 180 || stroke->paintColor != other->stroke->paintColor | 180 || stroke->paintColor != other->stroke->paintColor |
| 181 || stroke->paintUri != other->stroke->paintUri | 181 || stroke->paintUri != other->stroke->paintUri |
| 182 || stroke->miterLimit != other->stroke->miterLimit | 182 || stroke->miterLimit != other->stroke->miterLimit |
| 183 || *stroke->dashArray != *other->stroke->dashArray | 183 || *stroke->dashArray != *other->stroke->dashArray |
| 184 || stroke->dashOffset != other->stroke->dashOffset | 184 || stroke->dashOffset != other->stroke->dashOffset |
| 185 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor | 185 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor |
| 186 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri | 186 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri |
| 187 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) | 187 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) |
| 188 return true; | 188 return true; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 246 } |
| 247 | 247 |
| 248 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 248 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 249 { | 249 { |
| 250 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 250 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 251 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 251 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 252 return (EPaintOrderType)pt; | 252 return (EPaintOrderType)pt; |
| 253 } | 253 } |
| 254 | 254 |
| 255 } | 255 } |
| OLD | NEW |