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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 79d1cae0d36dcecc6613c3f40b7fab587851dc4c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 18 23:50:23 2004 +0000

            Reviewed by John.
    
            - re-fixed <rdar://problem/3701893> show expert preferences notes in xcode causes crash (in EllipsisBox code)
    
            * khtml/rendering/render_block.cpp: (khtml::RenderBlock::paintEllipsisBoxes):
            Check !isInlineFlow rather than checking hasMarkupTruncation. Otherwise, we break
            plain old non-markup truncation.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 470484c..0685447 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
 
         Reviewed by John.
 
+        - re-fixed <rdar://problem/3701893> show expert preferences notes in xcode causes crash (in EllipsisBox code)
+
+        * khtml/rendering/render_block.cpp: (khtml::RenderBlock::paintEllipsisBoxes):
+        Check !isInlineFlow rather than checking hasMarkupTruncation. Otherwise, we break
+        plain old non-markup truncation.
+
+2004-06-18  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
         - fixed <rdar://problem/3701893> show expert preferences notes in xcode causes crash (in EllipsisBox code)
 
         * khtml/rendering/render_block.cpp: (khtml::RenderBlock::paintEllipsisBoxes):
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 7aad010..3159e1c 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1374,7 +1374,7 @@ void RenderBlock::paintEllipsisBoxes(PaintInfo& i, int _tx, int _ty)
         // See if our boxes intersect with the dirty rect.  If so, then we paint
         // them.  Note that boxes can easily overlap, so we can't make any assumptions
         // based off positions of our first line box or our last line box.
-        if (hasMarkupTruncation()) {
+        if (!isInlineFlow()) {
             for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
                 yPos = _ty + curr->yPos();
                 h = curr->height();

-- 
WebKit Debian packaging