Changeset 16421 in webkit

Timestamp:

Sep 18, 2006 2:25:48 AM (18 years ago)

Author:

rwlbuis

Message:

Reviewed by Maciej.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=10807
REGRESSION (r16259): Repro crash on manual-tests/svg-repaint-image.svg

Make sure the paint method is not exited without popping
context and transparency layer.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kcanvas/RenderSVGImage.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-18  Rob Buis  <buis@kde.org>
+
+        Reviewed by Maciej.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10807
+        REGRESSION (r16259): Repro crash on manual-tests/svg-repaint-image.svg
+
+        Make sure the paint method is not exited without popping
+        context and transparency layer.
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * kcanvas/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::paint):
+
 2006-09-18  Graham Dennis  <graham.dennis@gmail.com>
 

trunk/WebCore/kcanvas/RenderSVGImage.cpp

@@ -167 +167 @@
 
     int x = 0, y = 0;
-    if (!shouldPaint(pi, x, y))
-        return;
+    if (shouldPaint(pi, x, y)) {
+        SVGImageElement *imageElt = static_cast<SVGImageElement *>(node());
         
-    SVGImageElement *imageElt = static_cast<SVGImageElement *>(node());
-        
-    if (imageElt->preserveAspectRatio()->align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE)
-        RenderImage::paint(pi, 0, 0);
-    else {
-        FloatRect destRect(m_x, m_y, contentWidth(), contentHeight());
-        FloatRect srcRect(0, 0, image()->width(), image()->height());
-        adjustRectsForAspectRatio(destRect, srcRect, imageElt->preserveAspectRatio());
-        c->drawImage(image(), destRect, srcRect);
-    }
-
-    if (filter)
-        filter->applyFilter(boundingBox);
+        if (imageElt->preserveAspectRatio()->align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE)
+            RenderImage::paint(pi, 0, 0);
+        else {
+            FloatRect destRect(m_x, m_y, contentWidth(), contentHeight());
+            FloatRect srcRect(0, 0, image()->width(), image()->height());
+            adjustRectsForAspectRatio(destRect, srcRect, imageElt->preserveAspectRatio());
+            c->drawImage(image(), destRect, srcRect);
+        }
+
+        if (filter)
+            filter->applyFilter(boundingBox);
+    }
     
     if (opacity < 1.0f)