[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 207b317fb978ede8a7650603129ad58cee4c24ad
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 18 23:21:55 2004 +0000

            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):
            Only walk the ellipsis list if hasMarkupTruncation is true.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 04947a6..17ea462 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -12454,7 +12454,7 @@ b2002-11-08  Darin Adler  <darin at apple.com>
 	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
 	Roll the change out while I see why it causes a crash.
 
-prim2002-05-17  Darin Adler  <darin at apple.com>
+2002-05-17  Darin Adler  <darin at apple.com>
 
 	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
 	Remove an old incorrect fix for a style leak in here and put in
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0e3b5f1..470484c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+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):
+        Only walk the ellipsis list if hasMarkupTruncation is true.
+
 2004-06-18  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 99c2d77..7aad010 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1374,11 +1374,13 @@ 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.
-        for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
-            yPos = _ty + curr->yPos();
-            h = curr->height();
-            if (curr->ellipsisBox() && (yPos < i.r.y() + i.r.height()) && (yPos + h > i.r.y()))
-                curr->paintEllipsisBox(i, _tx, _ty);
+        if (hasMarkupTruncation()) {
+            for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
+                yPos = _ty + curr->yPos();
+                h = curr->height();
+                if (curr->ellipsisBox() && (yPos < i.r.y() + i.r.height()) && (yPos + h > i.r.y()))
+                    curr->paintEllipsisBox(i, _tx, _ty);
+            }
         }
     }
 }

-- 
WebKit Debian packaging