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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 8ed77bd988524916af133a55d0a6facddb8b2cdd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 11 19:30:05 2003 +0000

    	Fixed: <rdar://problem/3480281>: drag image of selected text and images include broken images
    
            Reviewed by dave.
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::paintObject): when drawing the drag image, don't draw the broken image
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5453 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6d0a3fa..7733d03 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-11-11  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3480281>: drag image of selected text and images include broken images
+	
+        Reviewed by dave.
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::paintObject): when drawing the drag image, don't draw the broken image
+
 2003-11-11  Vicki Murley  <vicki at apple.com>
 
         Reviewed by sullivan.
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index b6f9a2e..885450a 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -238,6 +238,9 @@ void RenderImage::paintObject(QPainter *p, int /*_x*/, int /*_y*/, int /*_w*/, i
     //kdDebug( 6040 ) << "    contents (" << contentWidth << "/" << contentHeight << ") border=" << borderLeft() << " padding=" << paddingLeft() << endl;
     if ( pix.isNull() || berrorPic)
     {
+        if (paintAction == PaintActionSelection) {
+            return;
+        }
         if(cWidth > 2 && cHeight > 2)
         {
 #if APPLE_CHANGES

-- 
WebKit Debian packaging