From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 13:36:51 +0100 Subject: Merge WebKit at r78450: Initial merge by git. Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1 --- Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp') 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 -- cgit v1.1