diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:23:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch) | |
| tree | 73f9065f370435d6fde32ae129d458a8c77c8dff /WebCore/svg/SVGTextElement.cpp | |
| parent | bf14be70295513b8076f3fa47a268a7e42b2c478 (diff) | |
| download | external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2 | |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebCore/svg/SVGTextElement.cpp')
| -rw-r--r-- | WebCore/svg/SVGTextElement.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/svg/SVGTextElement.cpp b/WebCore/svg/SVGTextElement.cpp index 7de34fe..96fd11a 100644 --- a/WebCore/svg/SVGTextElement.cpp +++ b/WebCore/svg/SVGTextElement.cpp @@ -23,6 +23,7 @@ #if ENABLE(SVG) #include "SVGTextElement.h" +#include "AffineTransform.h" #include "FloatRect.h" #include "MappedAttribute.h" #include "RenderSVGText.h" @@ -30,7 +31,6 @@ #include "SVGRenderStyle.h" #include "SVGTSpanElement.h" #include "SVGTransformList.h" -#include "TransformationMatrix.h" namespace WebCore { @@ -72,25 +72,25 @@ FloatRect SVGTextElement::getBBox() const return SVGTransformable::getBBox(this); } -TransformationMatrix SVGTextElement::getScreenCTM() const +AffineTransform SVGTextElement::getScreenCTM() const { return SVGTransformable::getScreenCTM(this); } -TransformationMatrix SVGTextElement::getCTM() const +AffineTransform SVGTextElement::getCTM() const { return SVGTransformable::getCTM(this); } -TransformationMatrix SVGTextElement::animatedLocalTransform() const +AffineTransform SVGTextElement::animatedLocalTransform() const { return m_supplementalTransform ? transform()->concatenate().matrix() * *m_supplementalTransform : transform()->concatenate().matrix(); } -TransformationMatrix* SVGTextElement::supplementalTransform() +AffineTransform* SVGTextElement::supplementalTransform() { if (!m_supplementalTransform) - m_supplementalTransform.set(new TransformationMatrix()); + m_supplementalTransform.set(new AffineTransform()); return m_supplementalTransform.get(); } |