diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp')
-rw-r--r-- | Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp index 2a68d92..fcad27f 100644 --- a/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp +++ b/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp @@ -86,11 +86,10 @@ FloatRect RenderSVGResourceMarker::markerBoundaries(const AffineTransform& marke const AffineTransform& RenderSVGResourceMarker::localToParentTransform() const { - AffineTransform viewportTranslation(viewportTransform()); - m_localToParentTransform = viewportTranslation.translateRight(m_viewport.x(), m_viewport.y()); + m_localToParentTransform = AffineTransform::translation(m_viewport.x(), m_viewport.y()) * viewportTransform(); return m_localToParentTransform; // If this class were ever given a localTransform(), then the above would read: - // return viewportTransform() * localTransform() * viewportTranslation; + // return viewportTranslation * localTransform() * viewportTransform(); } FloatPoint RenderSVGResourceMarker::referencePoint() const |