[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 c591bdee985a2f64dec89216e5aaf943ef3c3a02
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 9 01:49:24 2004 +0000

    	Fix for 3524118, floats don't repaint when moved.
    
            Reviewed by darin
    
             * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::positionNewFloats):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fcfe2d7..b0914b5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-01-08  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3524118, floats don't repaint when moved.
+	
+        Reviewed by darin
+
+         * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::positionNewFloats):
+ 
+2004-01-08  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3519003, crash in mail because <dir> and <menu> don't allow the same children as <ul> and <ol>.
 	
         Reviewed by darin
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index aef4ec7..d82763a 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1415,6 +1415,12 @@ void RenderBlock::positionNewFloats()
                                //kdDebug( 6040 ) << " Object width: " << fwidth << " available width: " << ro - lo << endl;
         if (ro - lo < fwidth)
             fwidth = ro - lo; // Never look for more than what will be available.
+        
+#ifdef INCREMENTAL_REPAINTING
+        int oldChildX = o->xPos();
+        int oldChildY = o->yPos();
+#endif
+        
         if (o->style()->floating() == FLEFT)
         {
             if ( o->style()->clear() & CLEFT )
@@ -1452,6 +1458,11 @@ void RenderBlock::positionNewFloats()
         f->startY = y;
         f->endY = f->startY + _height;
 
+#ifdef INCREMENTAL_REPAINTING
+        // If the child moved, we have to repaint it.
+        if (checkForRepaintDuringLayout())
+            o->repaintDuringLayoutIfMoved(oldChildX, oldChildY);
+#endif    
 
         //kdDebug( 6040 ) << "floatingObject x/y= (" << f->left << "/" << f->startY << "-" << f->width << "/" << f->endY - f->startY << ")" << endl;
 

-- 
WebKit Debian packaging