| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // If CSS property was set, use that, otherwise fallback to attribute (if se
t). | 68 // If CSS property was set, use that, otherwise fallback to attribute (if se
t). |
| 69 if (style && style->hasTransform()) { | 69 if (style && style->hasTransform()) { |
| 70 // Note: objectBoundingBox is an emptyRect for elements like pattern or
clipPath. | 70 // Note: objectBoundingBox is an emptyRect for elements like pattern or
clipPath. |
| 71 // See the "Object bounding box units" section of http://dev.w3.org/cssw
g/css3-transforms/ | 71 // See the "Object bounding box units" section of http://dev.w3.org/cssw
g/css3-transforms/ |
| 72 TransformationMatrix transform; | 72 TransformationMatrix transform; |
| 73 style->applyTransform(transform, renderer()->objectBoundingBox()); | 73 style->applyTransform(transform, renderer()->objectBoundingBox()); |
| 74 | 74 |
| 75 // Flatten any 3D transform. | 75 // Flatten any 3D transform. |
| 76 matrix = transform.toAffineTransform(); | 76 matrix = transform.toAffineTransform(); |
| 77 } else { | 77 } else { |
| 78 transform().concatenate(matrix); | 78 transformCurrentValue().concatenate(matrix); |
| 79 } | 79 } |
| 80 | 80 |
| 81 if (m_supplementalTransform) | 81 if (m_supplementalTransform) |
| 82 return *m_supplementalTransform * matrix; | 82 return *m_supplementalTransform * matrix; |
| 83 return matrix; | 83 return matrix; |
| 84 } | 84 } |
| 85 | 85 |
| 86 AffineTransform* SVGGraphicsElement::supplementalTransform() | 86 AffineTransform* SVGGraphicsElement::supplementalTransform() |
| 87 { | 87 { |
| 88 if (!m_supplementalTransform) | 88 if (!m_supplementalTransform) |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 } | 167 } |
| 168 | 168 |
| 169 void SVGGraphicsElement::toClipPath(Path& path) | 169 void SVGGraphicsElement::toClipPath(Path& path) |
| 170 { | 170 { |
| 171 updatePathFromGraphicsElement(this, path); | 171 updatePathFromGraphicsElement(this, path); |
| 172 // FIXME: How do we know the element has done a layout? | 172 // FIXME: How do we know the element has done a layout? |
| 173 path.transform(animatedLocalTransform()); | 173 path.transform(animatedLocalTransform()); |
| 174 } | 174 } |
| 175 | 175 |
| 176 } | 176 } |
| OLD | NEW |