| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 if (!svgInheritParent) | 100 if (!svgInheritParent) |
| 101 return; | 101 return; |
| 102 | 102 |
| 103 fill = svgInheritParent->fill; | 103 fill = svgInheritParent->fill; |
| 104 stroke = svgInheritParent->stroke; | 104 stroke = svgInheritParent->stroke; |
| 105 inheritedResources = svgInheritParent->inheritedResources; | 105 inheritedResources = svgInheritParent->inheritedResources; |
| 106 | 106 |
| 107 svg_inherited_flags = svgInheritParent->svg_inherited_flags; | 107 svg_inherited_flags = svgInheritParent->svg_inherited_flags; |
| 108 } | 108 } |
| 109 | 109 |
| 110 void SVGLayoutStyle::copyNonInheritedFrom(const SVGLayoutStyle* other) | 110 void SVGLayoutStyle::copyNonInheritedFromCached(const SVGLayoutStyle* other) |
| 111 { | 111 { |
| 112 svg_noninherited_flags = other->svg_noninherited_flags; | 112 svg_noninherited_flags = other->svg_noninherited_flags; |
| 113 stops = other->stops; | 113 stops = other->stops; |
| 114 misc = other->misc; | 114 misc = other->misc; |
| 115 resources = other->resources; | 115 resources = other->resources; |
| 116 } | 116 } |
| 117 | 117 |
| 118 StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const | 118 StyleDifference SVGLayoutStyle::diff(const SVGLayoutStyle* other) const |
| 119 { | 119 { |
| 120 StyleDifference styleDifference; | 120 StyleDifference styleDifference; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 } | 226 } |
| 227 | 227 |
| 228 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 228 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 229 { | 229 { |
| 230 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 230 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 231 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 231 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 232 return (EPaintOrderType)pt; | 232 return (EPaintOrderType)pt; |
| 233 } | 233 } |
| 234 | 234 |
| 235 } | 235 } |
| OLD | NEW |