[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 7bab89cf1105f5a608721b04b0c9bd2e35f2d778
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 9 23:15:57 2003 +0000

    	Fix the dirty rect checks on various render_objects to be more accurate so that page-break properties don't
    	have mojibake when printing.
    
            Reviewed by john
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::paint):
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::paintLineBoxBackgroundBorder):
            (RenderFlow::paintLineBoxDecorations):
            * khtml/rendering/render_replaced.cpp:
            (RenderReplaced::paint):
            * khtml/rendering/render_table.cpp:
            (RenderTable::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2e78c80..57ec454 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-12-09  David Hyatt  <hyatt at apple.com>
+
+	Fix the dirty rect checks on various render_objects to be more accurate so that page-break properties don't
+	have mojibake when printing.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::paint):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::paintLineBoxBackgroundBorder):
+        (RenderFlow::paintLineBoxDecorations):
+        * khtml/rendering/render_replaced.cpp:
+        (RenderReplaced::paint):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::paint):
+
 2003-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 230d235..accf484 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1156,7 +1156,7 @@ void RenderBlock::paint(QPainter* p, int _x, int _y, int _w, int _h, int _tx, in
         if (m_firstLineBox && m_firstLineBox->topOverflow() < 0)
             yPos += m_firstLineBox->topOverflow();
         
-        if( (yPos > _y + _h) || (_ty + h < _y))
+        if( (yPos >= _y + _h) || (_ty + h <= _y))
             return;
     }
 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 8821868..1e29520 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -180,7 +180,7 @@ void RenderFlow::paintLineBoxBackgroundBorder(QPainter *p, int _x, int _y,
         // intersect.
         int yPos = _ty + firstLineBox()->yPos();
         int h = lastLineBox()->yPos() + lastLineBox()->height() - firstLineBox()->yPos();
-        if( (yPos > _y + _h) || (yPos + h < _y))
+        if( (yPos >= _y + _h) || (yPos + h <= _y))
             return;
 
         // See if our boxes intersect with the dirty rect.  If so, then we paint
@@ -190,7 +190,7 @@ void RenderFlow::paintLineBoxBackgroundBorder(QPainter *p, int _x, int _y,
         for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
             yPos = _ty + curr->yPos();
             h = curr->height();
-            if ((yPos <= _y + _h) && (yPos + h >= _y))
+            if ((yPos < _y + _h) && (yPos + h > _y))
                 curr->paintBackgroundAndBorder(p, _x, _y, _w, _h, _tx, _ty, xOffsetWithinLineBoxes);
             xOffsetWithinLineBoxes += curr->width();
         }
@@ -213,7 +213,7 @@ void RenderFlow::paintLineBoxDecorations(QPainter *p, int _x, int _y,
         // intersect.
         int yPos = _ty + firstLineBox()->yPos();;
         int h = lastLineBox()->yPos() + lastLineBox()->height() - firstLineBox()->yPos();
-        if( (yPos > _y + _h) || (yPos + h < _y))
+        if( (yPos >= _y + _h) || (yPos + h <= _y))
             return;
 
         // See if our boxes intersect with the dirty rect.  If so, then we paint
@@ -222,7 +222,7 @@ void RenderFlow::paintLineBoxDecorations(QPainter *p, int _x, int _y,
         for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
             yPos = _ty + curr->yPos();
             h = curr->height();
-            if ((yPos <= _y + _h) && (yPos + h >= _y))
+            if ((yPos < _y + _h) && (yPos + h > _y))
                 curr->paintDecorations(p, _x, _y, _w, _h, _tx, _ty);
         }
     }
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index 512a1ca..12b7a14 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -68,8 +68,7 @@ void RenderReplaced::paint(QPainter *p, int _x, int _y, int _w, int _h,
     // Early exit if the element touches the edges.
     if((_tx >= _x + _w) || (_tx + m_width <= _x))
         return;
-
-    if((_tx >= _x + _w) || (_tx + m_width <= _x))
+    if((_ty >= _y + _h) || (_ty + m_height <= _y))
         return;
 
     if(shouldPaintBackgroundOrBorder() && paintAction != PaintActionOutline) 
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 0ca81f7..559163a 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -420,8 +420,8 @@ void RenderTable::paint( QPainter *p, int _x, int _y,
 #endif
     if (!overhangingContents() && !isRelPositioned() && !isPositioned())
     {
-        if((_ty > _y + _h) || (_ty + height() < _y)) return;
-        if((_tx > _x + _w) || (_tx + width() < _x)) return;
+        if((_ty >= _y + _h) || (_ty + height() <= _y)) return;
+        if((_tx >= _x + _w) || (_tx + width() <= _x)) return;
     }
 
 #ifdef TABLE_PRINT

-- 
WebKit Debian packaging