OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 RenderStyle* style = renderer() ? renderer()->style() : 0; | 50 RenderStyle* style = renderer() ? renderer()->style() : 0; |
51 | 51 |
52 // if CSS property was set, use that, otherwise fallback to attribute (if se
t) | 52 // if CSS property was set, use that, otherwise fallback to attribute (if se
t) |
53 if (style && style->hasTransform()) { | 53 if (style && style->hasTransform()) { |
54 TransformationMatrix t; | 54 TransformationMatrix t; |
55 // For now, the transform-origin is not taken into account | 55 // For now, the transform-origin is not taken into account |
56 // Also, any percentage values will not be taken into account | 56 // Also, any percentage values will not be taken into account |
57 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri
gin); | 57 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri
gin); |
58 // Flatten any 3D transform | 58 // Flatten any 3D transform |
59 matrix = t.toAffineTransform(); | 59 matrix = t.toAffineTransform(); |
60 } else | 60 } else { |
61 transform().concatenate(matrix); | 61 transformCurrentValue().concatenate(matrix); |
| 62 } |
62 | 63 |
63 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supple
mentalTransform(); | 64 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supple
mentalTransform(); |
64 if (transform) | 65 if (transform) |
65 return *transform * matrix; | 66 return *transform * matrix; |
66 return matrix; | 67 return matrix; |
67 } | 68 } |
68 | 69 |
69 RenderObject* SVGTextElement::createRenderer(RenderStyle*) | 70 RenderObject* SVGTextElement::createRenderer(RenderStyle*) |
70 { | 71 { |
71 return new (document()->renderArena()) RenderSVGText(this); | 72 return new (document()->renderArena()) RenderSVGText(this); |
72 } | 73 } |
73 | 74 |
74 bool SVGTextElement::childShouldCreateRenderer(const NodeRenderingContext& child
Context) const | 75 bool SVGTextElement::childShouldCreateRenderer(const NodeRenderingContext& child
Context) const |
75 { | 76 { |
76 if (childContext.node()->isTextNode() | 77 if (childContext.node()->isTextNode() |
77 || childContext.node()->hasTagName(SVGNames::aTag) | 78 || childContext.node()->hasTagName(SVGNames::aTag) |
78 #if ENABLE(SVG_FONTS) | 79 #if ENABLE(SVG_FONTS) |
79 || childContext.node()->hasTagName(SVGNames::altGlyphTag) | 80 || childContext.node()->hasTagName(SVGNames::altGlyphTag) |
80 #endif | 81 #endif |
81 || childContext.node()->hasTagName(SVGNames::textPathTag) | 82 || childContext.node()->hasTagName(SVGNames::textPathTag) |
82 || childContext.node()->hasTagName(SVGNames::trefTag) | 83 || childContext.node()->hasTagName(SVGNames::trefTag) |
83 || childContext.node()->hasTagName(SVGNames::tspanTag)) | 84 || childContext.node()->hasTagName(SVGNames::tspanTag)) |
84 return true; | 85 return true; |
85 | 86 |
86 return false; | 87 return false; |
87 } | 88 } |
88 | 89 |
89 } | 90 } |
OLD | NEW |