| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 111 } |
| 112 | 112 |
| 113 void SVGRenderStyle::copyNonInheritedFrom(const SVGRenderStyle* other) | 113 void SVGRenderStyle::copyNonInheritedFrom(const SVGRenderStyle* other) |
| 114 { | 114 { |
| 115 svg_noninherited_flags = other->svg_noninherited_flags; | 115 svg_noninherited_flags = other->svg_noninherited_flags; |
| 116 stops = other->stops; | 116 stops = other->stops; |
| 117 misc = other->misc; | 117 misc = other->misc; |
| 118 resources = other->resources; | 118 resources = other->resources; |
| 119 } | 119 } |
| 120 | 120 |
| 121 StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const | 121 StyleDifferenceLegacy SVGRenderStyle::diff(const SVGRenderStyle* other) const |
| 122 { | 122 { |
| 123 // NOTE: All comparisions that may return StyleDifferenceLayout have to go b
efore those who return StyleDifferenceRepaint | 123 // NOTE: All comparisions that may return StyleDifferenceLayout have to go b
efore those who return StyleDifferenceRepaint |
| 124 | 124 |
| 125 // If resources change, we need a relayout, as the presence of resources inf
luences the repaint rect. | 125 // If resources change, we need a relayout, as the presence of resources inf
luences the repaint rect. |
| 126 if (resources != other->resources) | 126 if (resources != other->resources) |
| 127 return StyleDifferenceLayout; | 127 return StyleDifferenceLayout; |
| 128 | 128 |
| 129 // If markers change, we need a relayout, as marker boundaries are cached in
RenderSVGPath. | 129 // If markers change, we need a relayout, as marker boundaries are cached in
RenderSVGPath. |
| 130 if (inheritedResources != other->inheritedResources) | 130 if (inheritedResources != other->inheritedResources) |
| 131 return StyleDifferenceLayout; | 131 return StyleDifferenceLayout; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 } | 212 } |
| 213 | 213 |
| 214 EPaintOrderType SVGRenderStyle::paintOrderType(unsigned index) const | 214 EPaintOrderType SVGRenderStyle::paintOrderType(unsigned index) const |
| 215 { | 215 { |
| 216 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 216 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 217 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 217 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 218 return (EPaintOrderType)pt; | 218 return (EPaintOrderType)pt; |
| 219 } | 219 } |
| 220 | 220 |
| 221 } | 221 } |
| OLD | NEW |