[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit d7736c4bf7987c7067e4112d44d40b353805f8e1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 5 23:24:20 2004 +0000

    	Fix for 3521466, generated image content should not try to calcWidth/height when it isn't yet rooted in
    	the rendering tree.
    
            Reviewed by john
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::setPixmap):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d919fc..4dfde13 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-01-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3521466, generated image content should not try to calcWidth/height when it isn't yet rooted in
+	the rendering tree.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setPixmap):
+
 2003-12-26  Darin Adler  <darin at apple.com>
 
         - one more small step to make -[KWQPageState dealloc] safer
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 885450a..f59a0c9 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -132,11 +132,10 @@ void RenderImage::setPixmap( const QPixmap &p, const QRect& r, CachedImage *o)
             setIntrinsicHeight( o->pixmap_size().height() );
         }
 
-        // In the case of generated image content using :before/:after, we aren't in the
-        // tree yet.  We don't need to worry about doing this check, since we'll get a
-        // layout when we get added in to the render tree hierarchy anyway.
-         
-        if (parent()) {
+        // In the case of generated image content using :before/:after, we might not be in the
+        // render tree yet.  In that case, we don't need to worry about check for layout, since we'll get a
+        // layout when we get added in to the render tree hierarchy later.
+        if (containingBlock()) {
             // lets see if we need to relayout at all..
             int oldwidth = m_width;
             int oldheight = m_height;

-- 
WebKit Debian packaging