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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 9b36036a9152a0f24bc2b62f935674ffcf1a3448
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 31 23:05:05 2003 +0000

            Reviewed by David
    
    	Fix for this bug:
    
    	<rdar://problem/3470233>: solid outlines drawing incorrectly
    
    	The problem was that when I collected the array of line boxes for
    	render inlines, I put a QRect() at the start and the end of the list.
    	However, the border calculation code expected "invalid" rectangles
    	(rects with 0 for all four dimentions) in the first and last
    	positions, and the default constructor for QRect makes rects with 1,1
    	for width/height.
    
            * khtml/rendering/render_inline.cpp:
            (RenderInline::paintOutlines)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a21871b..944a12e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-10-31  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by David
+
+	Fix for this bug:
+
+	<rdar://problem/3470233>: solid outlines drawing incorrectly
+
+	The problem was that when I collected the array of line boxes for
+	render inlines, I put a QRect() at the start and the end of the list.
+	However, the border calculation code expected "invalid" rectangles
+	(rects with 0 for all four dimentions) in the first and last
+	positions, and the default constructor for QRect makes rects with 1,1
+	for width/height.
+
+        * khtml/rendering/render_inline.cpp:
+        (RenderInline::paintOutlines)
+
 2003-10-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_inline.cpp b/WebCore/khtml/rendering/render_inline.cpp
index 652cd4e..a2d63b2 100644
--- a/WebCore/khtml/rendering/render_inline.cpp
+++ b/WebCore/khtml/rendering/render_inline.cpp
@@ -348,11 +348,11 @@ void RenderInline::paintOutlines(QPainter *p, int _tx, int _ty)
     QPtrList <QRect> rects;
     rects.setAutoDelete(true);
 
-    rects.append(new QRect());
+    rects.append(new QRect(0,0,0,0));
     for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
         rects.append(new QRect(curr->xPos(), curr->yPos(), curr->width(), curr->height()));
     }
-    rects.append(new QRect());
+    rects.append(new QRect(0,0,0,0));
 
     for (unsigned int i = 1; i < rects.count() - 1; i++)
         paintOutline(p, _tx, _ty, *rects.at(i-1), *rects.at(i), *rects.at(i+1));

-- 
WebKit Debian packaging