| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 113 |
| 114 void SVGLayoutStyle::copyNonInheritedFromCached(const SVGLayoutStyle* other) | 114 void SVGLayoutStyle::copyNonInheritedFromCached(const SVGLayoutStyle* other) |
| 115 { | 115 { |
| 116 svg_noninherited_flags = other->svg_noninherited_flags; | 116 svg_noninherited_flags = other->svg_noninherited_flags; |
| 117 stops = other->stops; | 117 stops = other->stops; |
| 118 misc = other->misc; | 118 misc = other->misc; |
| 119 layout = other->layout; | 119 layout = other->layout; |
| 120 resources = other->resources; | 120 resources = other->resources; |
| 121 } | 121 } |
| 122 | 122 |
| 123 PassRefPtr<SVGDashArray> SVGLayoutStyle::initialStrokeDashArray() |
| 124 { |
| 125 DEFINE_STATIC_REF(SVGDashArray, initialDashArray, SVGDashArray::create()); |
| 126 return initialDashArray; |
| 127 } |
| 128 |
| 123 StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const | 129 StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const |
| 124 { | 130 { |
| 125 StyleDifference styleDifference; | 131 StyleDifference styleDifference; |
| 126 | 132 |
| 127 if (diffNeedsLayoutAndPaintInvalidation(other)) { | 133 if (diffNeedsLayoutAndPaintInvalidation(other)) { |
| 128 styleDifference.setNeedsFullLayout(); | 134 styleDifference.setNeedsFullLayout(); |
| 129 styleDifference.setNeedsPaintInvalidationObject(); | 135 styleDifference.setNeedsPaintInvalidationObject(); |
| 130 } else if (diffNeedsPaintInvalidation(other)) { | 136 } else if (diffNeedsPaintInvalidation(other)) { |
| 131 styleDifference.setNeedsPaintInvalidationObject(); | 137 styleDifference.setNeedsPaintInvalidationObject(); |
| 132 } | 138 } |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 } | 246 } |
| 241 | 247 |
| 242 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 248 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 243 { | 249 { |
| 244 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 250 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 245 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 251 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 246 return (EPaintOrderType)pt; | 252 return (EPaintOrderType)pt; |
| 247 } | 253 } |
| 248 | 254 |
| 249 } | 255 } |
| OLD | NEW |