[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 883e6bd1fa4368de55b9dc0e3c07dd0d639e9c7f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 23:30:24 2003 +0000

    	Fix for 3232637, don't let generated parentless image content
    	try to do width/height/layout calculations.  It will do this
    	all anyway, when it finally gets inserted into the rendering
    	tree.
    
            Reviewed by john
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::setPixmap):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index be425c5..eda944e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3232637, don't let generated parentless image content
+	try to do width/height/layout calculations.  It will do this
+	all anyway, when it finally gets inserted into the rendering
+	tree.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setPixmap):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3239404, a crash caused because a block-level :after
 	element was being inserted as generated content inside an
 	inline element.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index be425c5..eda944e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-05-01  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3232637, don't let generated parentless image content
+	try to do width/height/layout calculations.  It will do this
+	all anyway, when it finally gets inserted into the rendering
+	tree.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setPixmap):
+
+2003-05-01  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3239404, a crash caused because a block-level :after
 	element was being inserted as generated content inside an
 	inline element.
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index c7e471a..c96f12c 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -116,9 +116,13 @@ void RenderImage::setPixmap( const QPixmap &p, const QRect& r, CachedImage *o)
 
     bool needlayout = false;
 
+    // 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.
     // Image dimensions have been changed, see what needs to be done
-    if( o->pixmap_size().width() != intrinsicWidth() ||
-       o->pixmap_size().height() != intrinsicHeight() || iwchanged )
+     if ( parent() &&
+         ( o->pixmap_size().width() != intrinsicWidth() ||
+           o->pixmap_size().height() != intrinsicHeight() || iwchanged) )
     {
 //          qDebug("image dimensions have been changed, old: %d/%d  new: %d/%d",
 //                 intrinsicWidth(), intrinsicHeight(),

-- 
WebKit Debian packaging