[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[oliver at apple.com]

The following commit has been merged in the debian/unstable branch:
commit 83db5290a42382b183c94874e93c0dc84f4d3d0b
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 17 02:31:22 2010 +0000

    2010-01-16  Oliver Hunt  <oliver at apple.com>
    
            Reviewed by Nikolas Zimmermann.
    
            SVG Markers are getting culled incorrectly
            https://bugs.webkit.org/show_bug.cgi?id=33767
    
            Use applyTransformToPaintInfo to transform the paintInfo, otherwise
            the paint rect is not updated leading to incorrect culling.
    
            * svg/graphics/SVGResourceMarker.cpp:
            (WebCore::SVGResourceMarker::draw):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53370 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7307b16..9f8522c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-16  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        SVG Markers are getting culled incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=33767
+
+        Use applyTransformToPaintInfo to transform the paintInfo, otherwise
+        the paint rect is not updated leading to incorrect culling.
+
+        * svg/graphics/SVGResourceMarker.cpp:
+        (WebCore::SVGResourceMarker::draw):
+
 2010-01-15  John Sullivan  <sullivan at apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=33751 and <rdar://problem/7538330>
diff --git a/WebCore/svg/graphics/SVGResourceMarker.cpp b/WebCore/svg/graphics/SVGResourceMarker.cpp
index ad29785..955c048 100644
--- a/WebCore/svg/graphics/SVGResourceMarker.cpp
+++ b/WebCore/svg/graphics/SVGResourceMarker.cpp
@@ -72,13 +72,13 @@ void SVGResourceMarker::draw(RenderObject::PaintInfo& paintInfo, const Transform
 
     currentlyDrawingMarkers.add(this);
     ASSERT(!m_renderer->drawsContents());
-
-    paintInfo.context->save();
-    paintInfo.context->concatCTM(transform);
+    RenderObject::PaintInfo info(paintInfo);
+    info.context->save();
+    applyTransformToPaintInfo(info, transform);
     m_renderer->setDrawsContents(true);
-    m_renderer->paint(paintInfo, 0, 0);
+    m_renderer->paint(info, 0, 0);
     m_renderer->setDrawsContents(false);
-    paintInfo.context->restore();
+    info.context->restore();
 
     currentlyDrawingMarkers.remove(this);
 }

-- 
WebKit Debian packaging