[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 aaabccec0d55a276b0cc4357a9275701529a1861
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 10 18:49:18 2003 +0000

    	Fixed: <rdar://problem/3478781>: drag image of selected text and images doesn't include images
    
            Reviewed by rjw.
    
            * khtml/rendering/render_image.cpp:
            (RenderImage::paintObject): paint when the paint action is PaintActionSelection
            * khtml/rendering/render_replaced.cpp:
            (RenderReplaced::paint): ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fdda096..7526960 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-11-10  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3478781>: drag image of selected text and images doesn't include images
+
+        Reviewed by rjw.
+
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::paintObject): paint when the paint action is PaintActionSelection
+        * khtml/rendering/render_replaced.cpp:
+        (RenderReplaced::paint): ditto
+
 2003-11-10  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index 28c5a4f..2a3705d 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -197,7 +197,7 @@ void RenderImage::paintObject(QPainter *p, int /*_x*/, int /*_y*/, int /*_w*/, i
     if (paintAction == PaintActionOutline && style()->outlineWidth() && style()->visibility() == VISIBLE)
         paintOutline(p, _tx, _ty, width(), height(), style());
     
-    if (paintAction != PaintActionForeground)
+    if (paintAction != PaintActionForeground && paintAction != PaintActionSelection)
         return;
         
     int cWidth = contentWidth();
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index bfecb45..512a1ca 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -56,7 +56,7 @@ RenderReplaced::RenderReplaced(DOM::NodeImpl* node)
 void RenderReplaced::paint(QPainter *p, int _x, int _y, int _w, int _h,
                            int _tx, int _ty, PaintAction paintAction)
 {
-    if (paintAction != PaintActionForeground && paintAction != PaintActionOutline)
+    if (paintAction != PaintActionForeground && paintAction != PaintActionOutline && paintAction != PaintActionSelection)
         return;
         
     // if we're invisible or haven't received a layout yet, then just bail.

-- 
WebKit Debian packaging