| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAncho
r | 148 if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAncho
r |
| 149 || svg_inherited_flags._writingMode != other->svg_inherited_flags._writi
ngMode | 149 || svg_inherited_flags._writingMode != other->svg_inherited_flags._writi
ngMode |
| 150 || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherit
ed_flags._glyphOrientationHorizontal | 150 || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherit
ed_flags._glyphOrientationHorizontal |
| 151 || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited
_flags._glyphOrientationVertical | 151 || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited
_flags._glyphOrientationVertical |
| 152 || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherite
d_flags.f._alignmentBaseline | 152 || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherite
d_flags.f._alignmentBaseline |
| 153 || svg_noninherited_flags.f._dominantBaseline != other->svg_noninherited
_flags.f._dominantBaseline | 153 || svg_noninherited_flags.f._dominantBaseline != other->svg_noninherited
_flags.f._dominantBaseline |
| 154 || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_fl
ags.f._baselineShift) | 154 || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_fl
ags.f._baselineShift) |
| 155 return true; | 155 return true; |
| 156 | 156 |
| 157 // Text related properties influence layout. | 157 // Text related properties influence layout. |
| 158 if (*misc->baselineShiftValue != *other->misc->baselineShiftValue) | 158 if (misc->baselineShiftValue != other->misc->baselineShiftValue) |
| 159 return true; | 159 return true; |
| 160 | 160 |
| 161 // These properties affect the cached stroke bounding box rects. | 161 // These properties affect the cached stroke bounding box rects. |
| 162 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle | 162 if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle |
| 163 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty
le) | 163 || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinSty
le) |
| 164 return true; | 164 return true; |
| 165 | 165 |
| 166 // vector-effect changes require a re-layout. | 166 // vector-effect changes require a re-layout. |
| 167 if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.
f._vectorEffect) | 167 if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.
f._vectorEffect) |
| 168 return true; | 168 return true; |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 } | 238 } |
| 239 | 239 |
| 240 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const | 240 EPaintOrderType SVGLayoutStyle::paintOrderType(unsigned index) const |
| 241 { | 241 { |
| 242 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); | 242 ASSERT(index < ((1 << kPaintOrderBitwidth)-1)); |
| 243 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); | 243 unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaint
OrderBitwidth) - 1); |
| 244 return (EPaintOrderType)pt; | 244 return (EPaintOrderType)pt; |
| 245 } | 245 } |
| 246 | 246 |
| 247 } | 247 } |
| OLD | NEW |