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

[dglazkov at chromium.org]

The following commit has been merged in the debian/unstable branch:
commit cc361bd9397fb744910020c841d3293dfd3d92ee
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 17:46:46 2010 +0000

    2010-01-15  Dimitri Glazkov  <dglazkov at chromium.org>
    
            No review, rolling out r53331.
            http://trac.webkit.org/changeset/53331
            https://bugs.webkit.org/show_bug.cgi?id=30055
    
            Broke fast/borders/svg-as-border-image-3.html. Don't give up,
            Oliver! You are really, really close.
    
            * rendering/RenderPath.cpp:
            (WebCore::RenderPath::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f4b41d4..8b31e9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-15  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        No review, rolling out r53331.
+        http://trac.webkit.org/changeset/53331
+        https://bugs.webkit.org/show_bug.cgi?id=30055
+
+        Broke fast/borders/svg-as-border-image-3.html. Don't give up,
+        Oliver! You are really, really close.
+
+        * rendering/RenderPath.cpp:
+        (WebCore::RenderPath::paint):
+
 2010-01-15  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/rendering/RenderPath.cpp b/WebCore/rendering/RenderPath.cpp
index 81cddfa..86d280b 100644
--- a/WebCore/rendering/RenderPath.cpp
+++ b/WebCore/rendering/RenderPath.cpp
@@ -215,40 +215,32 @@ void RenderPath::paint(PaintInfo& paintInfo, int, int)
 {
     if (paintInfo.context->paintingDisabled() || style()->visibility() == HIDDEN || m_path.isEmpty())
         return;
-
-    PaintInfo childPaintInfo(paintInfo);
-    childPaintInfo.context->save();
-    applyTransformToPaintInfo(childPaintInfo, m_localTransform);
-    FloatRect boundingBox = repaintRectInLocalCoordinates();
-    // FIXME: The empty rect check is to deal with incorrect initial clip in renderSubtreeToImage
-    // unfortunately fixing that problem is fairly complex unless we were willing to just futz the
-    // rect to something "close enough"
-    if (!boundingBox.intersects(childPaintInfo.rect) && !childPaintInfo.rect.isEmpty()) {
-        childPaintInfo.context->restore();
-        return;
-    }
+            
+    paintInfo.context->save();
+    paintInfo.context->concatCTM(localToParentTransform());
 
     SVGResourceFilter* filter = 0;
 
-    if (childPaintInfo.phase == PaintPhaseForeground) {
-        PaintInfo savedInfo(childPaintInfo);
+    FloatRect boundingBox = repaintRectInLocalCoordinates();
+    if (paintInfo.phase == PaintPhaseForeground) {
+        PaintInfo savedInfo(paintInfo);
 
-        if (prepareToRenderSVGContent(this, childPaintInfo, boundingBox, filter)) {
+        if (prepareToRenderSVGContent(this, paintInfo, boundingBox, filter)) {
             if (style()->svgStyle()->shapeRendering() == SR_CRISPEDGES)
-                childPaintInfo.context->setShouldAntialias(false);
-            fillAndStrokePath(m_path, childPaintInfo.context, style(), this);
+                paintInfo.context->setShouldAntialias(false);
+            fillAndStrokePath(m_path, paintInfo.context, style(), this);
 
             if (static_cast<SVGStyledElement*>(node())->supportsMarkers())
-                m_markerLayoutInfo.drawMarkers(childPaintInfo);
+                m_markerLayoutInfo.drawMarkers(paintInfo);
         }
-        finishRenderSVGContent(this, childPaintInfo, filter, savedInfo.context);
+        finishRenderSVGContent(this, paintInfo, filter, savedInfo.context);
     }
 
-    if ((childPaintInfo.phase == PaintPhaseOutline || childPaintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
-        paintOutline(childPaintInfo.context, static_cast<int>(boundingBox.x()), static_cast<int>(boundingBox.y()),
+    if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
+        paintOutline(paintInfo.context, static_cast<int>(boundingBox.x()), static_cast<int>(boundingBox.y()),
             static_cast<int>(boundingBox.width()), static_cast<int>(boundingBox.height()), style());
     
-    childPaintInfo.context->restore();
+    paintInfo.context->restore();
 }
 
 // This method is called from inside paintOutline() since we call paintOutline()

-- 
WebKit Debian packaging