| 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 || stroke->paintUri != other->stroke->paintUri | 175 || stroke->paintUri != other->stroke->paintUri |
| 176 || stroke->miterLimit != other->stroke->miterLimit | 176 || stroke->miterLimit != other->stroke->miterLimit |
| 177 || *stroke->dashArray != *other->stroke->dashArray | 177 || *stroke->dashArray != *other->stroke->dashArray |
| 178 || *stroke->dashOffset != *other->stroke->dashOffset | 178 || *stroke->dashOffset != *other->stroke->dashOffset |
| 179 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor | 179 || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintC
olor |
| 180 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri | 180 || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri |
| 181 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) | 181 || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintTy
pe) |
| 182 return true; | 182 return true; |
| 183 } | 183 } |
| 184 | 184 |
| 185 // The x and y properties require a re-layout. | 185 // The x, y, rx and ry properties require a re-layout. |
| 186 if (layout.get() != other->layout.get()) { | 186 if (layout.get() != other->layout.get()) { |
| 187 if (layout->x != other->layout->x | 187 if (layout->x != other->layout->x |
| 188 || layout->y != other->layout->y) | 188 || layout->y != other->layout->y |
| 189 || layout->rx != other->layout->rx |
| 190 || layout->ry != other->layout->ry) |
| 189 return true; | 191 return true; |
| 190 } | 192 } |
| 191 | 193 |
| 192 return false; | 194 return false; |
| 193 } | 195 } |
| 194 | 196 |
| 195 bool SVGLayoutStyle::diffNeedsPaintInvalidation(const SVGLayoutStyle* other) con
st | 197 bool SVGLayoutStyle::diffNeedsPaintInvalidation(const SVGLayoutStyle* other) con
st |
| 196 { | 198 { |
| 197 if (stroke->opacity != other->stroke->opacity) | 199 if (stroke->opacity != other->stroke->opacity) |
| 198 return true; | 200 return true; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 } | 240 } |
| 239 | 241 |
| 240 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 242 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 241 { | 243 { |
| 242 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 244 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 243 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 245 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 244 return (EPaintOrderType)pt; | 246 return (EPaintOrderType)pt; |
| 245 } | 247 } |
| 246 | 248 |
| 247 } | 249 } |
| OLD | NEW |