| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 // if CSS property was set, use that, otherwise fallback to attribute (if se
t) | 49 // if CSS property was set, use that, otherwise fallback to attribute (if se
t) |
| 50 if (style && style->hasTransform()) { | 50 if (style && style->hasTransform()) { |
| 51 TransformationMatrix t; | 51 TransformationMatrix t; |
| 52 // For now, the transform-origin is not taken into account | 52 // For now, the transform-origin is not taken into account |
| 53 // Also, any percentage values will not be taken into account | 53 // Also, any percentage values will not be taken into account |
| 54 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri
gin); | 54 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri
gin); |
| 55 // Flatten any 3D transform | 55 // Flatten any 3D transform |
| 56 matrix = t.toAffineTransform(); | 56 matrix = t.toAffineTransform(); |
| 57 } else { | 57 } else { |
| 58 transformCurrentValue().concatenate(matrix); | 58 transform()->currentValue()->concatenate(matrix); |
| 59 } | 59 } |
| 60 | 60 |
| 61 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supple
mentalTransform(); | 61 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supple
mentalTransform(); |
| 62 if (transform) | 62 if (transform) |
| 63 return *transform * matrix; | 63 return *transform * matrix; |
| 64 return matrix; | 64 return matrix; |
| 65 } | 65 } |
| 66 | 66 |
| 67 RenderObject* SVGTextElement::createRenderer(RenderStyle*) | 67 RenderObject* SVGTextElement::createRenderer(RenderStyle*) |
| 68 { | 68 { |
| 69 return new RenderSVGText(this); | 69 return new RenderSVGText(this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } | 72 } |
| OLD | NEW |