[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 75fabb881f985f0b943599399f9927837bb2d77a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 14 22:00:07 2003 +0000

    	Fix for 3248193.  Floats with layers paint twice.  The fix
    	is to make sure floats are not painted during the float phase
    	if they also have a layer.
    
            Reviewed by john
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f9b49fe..a86897a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-05-14  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3248193.  Floats with layers paint twice.  The fix
+	is to make sure floats are not painted during the float phase
+	if they also have a layer.
+	
+        Reviewed by john
+	
+        * khtml/rendering/render_block.cpp:
+
+2003-05-14  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3258389, min-width should take precedence over max-width.
 	I just had an "else" that shouldn't have been there, so that
 	min-width would get checked even if max-width was also checked.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f9b49fe..a86897a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-05-14  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3248193.  Floats with layers paint twice.  The fix
+	is to make sure floats are not painted during the float phase
+	if they also have a layer.
+	
+        Reviewed by john
+	
+        * khtml/rendering/render_block.cpp:
+
+2003-05-14  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3258389, min-width should take precedence over max-width.
 	I just had an "else" that shouldn't have been there, so that
 	min-width would get checked even if max-width was also checked.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index af20f40..aaa2f0d 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1144,7 +1144,7 @@ void RenderBlock::paintFloats(QPainter *p, int _x, int _y,
     QPtrListIterator<FloatingObject> it(*m_floatingObjects);
     for ( ; (r = it.current()); ++it) {
         // Only paint the object if our noPaint flag isn't set.
-        if (r->node->isFloating() && !r->noPaint) {
+        if (r->node->isFloating() && !r->noPaint && !r->node->layer()) {
             if (paintSelection) {
                 r->node->paint(p, _x, _y, _w, _h,
                                _tx + r->left - r->node->xPos() + r->node->marginLeft(),
@@ -1812,7 +1812,7 @@ bool RenderBlock::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
         FloatingObject* o;
         QPtrListIterator<FloatingObject> it(*m_floatingObjects);
         for (it.toLast(); (o = it.current()); --it)
-            if (!o->noPaint)
+            if (!o->noPaint && !o->node->layer())
                 inBox |= o->node->nodeAtPoint(info, _x, _y,
                                               stx+o->left + o->node->marginLeft() - o->node->xPos(),
                                               sty+o->startY + o->node->marginTop() - o->node->yPos());

-- 
WebKit Debian packaging