| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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; |
| 189 } | 189 } |
| 190 | 190 |
| 191 // The x, y, rx and ry properties require a re-layout. | 191 // The x, y, rx and ry properties require a re-layout. |
| 192 if (layout.get() != other->layout.get()) { | 192 if (layout.get() != other->layout.get()) { |
| 193 if (layout->x != other->layout->x | 193 if (layout->x != other->layout->x |
| 194 || layout->y != other->layout->y | 194 || layout->y != other->layout->y |
| 195 || layout->r != other->layout->r |
| 195 || layout->rx != other->layout->rx | 196 || layout->rx != other->layout->rx |
| 196 || layout->ry != other->layout->ry) | 197 || layout->ry != other->layout->ry |
| 198 || layout->cx != other->layout->cx |
| 199 || layout->cy != other->layout->cy) |
| 197 return true; | 200 return true; |
| 198 } | 201 } |
| 199 | 202 |
| 200 return false; | 203 return false; |
| 201 } | 204 } |
| 202 | 205 |
| 203 bool SVGLayoutStyle::diffNeedsPaintInvalidation(const SVGLayoutStyle* other) con
st | 206 bool SVGLayoutStyle::diffNeedsPaintInvalidation(const SVGLayoutStyle* other) con
st |
| 204 { | 207 { |
| 205 if (stroke->opacity != other->stroke->opacity) | 208 if (stroke->opacity != other->stroke->opacity) |
| 206 return true; | 209 return true; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 249 } |
| 247 | 250 |
| 248 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 251 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 249 { | 252 { |
| 250 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 253 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 251 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 254 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 252 return (EPaintOrderType)pt; | 255 return (EPaintOrderType)pt; |
| 253 } | 256 } |
| 254 | 257 |
| 255 } | 258 } |
| OLD | NEW |