[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 a6dbc270559715d18feb154ef4b8381999efa000
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 5 17:51:41 2003 +0000

    	Fix for 3248587.  Refine the crash fix for generated image
    	content so that we still set the image's intrinsic width
    	and height properly.
    
            Reviewed by john
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::setPixmap):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8df49d2..d76342b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-05-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3248587.  Refine the crash fix for generated image
+	content so that we still set the image's intrinsic width
+	and height properly.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setPixmap):
+
 2003-05-04  David Hyatt  <hyatt at apple.com>
 
 	When using the content property in CSS, you can string together
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8df49d2..d76342b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-05-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3248587.  Refine the crash fix for generated image
+	content so that we still set the image's intrinsic width
+	and height properly.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setPixmap):
+
 2003-05-04  David Hyatt  <hyatt at apple.com>
 
 	When using the content property in CSS, you can string together
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 57c6c66..df447b0 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -118,12 +118,8 @@ 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 ( parent() &&
-         ( o->pixmap_size().width() != intrinsicWidth() ||
+     if ( ( o->pixmap_size().width() != intrinsicWidth() ||
            o->pixmap_size().height() != intrinsicHeight() || iwchanged) )
     {
 //          qDebug("image dimensions have been changed, old: %d/%d  new: %d/%d",
@@ -135,17 +131,23 @@ void RenderImage::setPixmap( const QPixmap &p, const QRect& r, CachedImage *o)
             setIntrinsicHeight( o->pixmap_size().height() );
         }
 
-        // lets see if we need to relayout at all..
-        int oldwidth = m_width;
-        int oldheight = m_height;
-        calcWidth();
-        calcHeight();
-
-        if(iwchanged || m_width != oldwidth || m_height != oldheight)
-            needlayout = true;
-
-        m_width = oldwidth;
-        m_height = oldheight;
+        // 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()) {
+            // lets see if we need to relayout at all..
+            int oldwidth = m_width;
+            int oldheight = m_height;
+            calcWidth();
+            calcHeight();
+    
+            if(iwchanged || m_width != oldwidth || m_height != oldheight)
+                needlayout = true;
+    
+            m_width = oldwidth;
+            m_height = oldheight;
+        }
     }
 
 #if APPLE_CHANGES

-- 
WebKit Debian packaging