[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 4634eba83ad56f193cab094ad78830bcf39dc713
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 18 20:13:45 2003 +0000

    	Fix for 3171795, dotted borders drawn incorrectly.  Picked this
    	gem up from the KHTML trunk.
    
            Reviewed by darin
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::drawBorder):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a6850d8..90fca0f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-02-18  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3171795, dotted borders drawn incorrectly.  Picked this
+	gem up from the KHTML trunk.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::drawBorder):
+
 2003-02-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a6850d8..90fca0f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-02-18  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3171795, dotted borders drawn incorrectly.  Picked this
+	gem up from the KHTML trunk.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::drawBorder):
+
 2003-02-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index c0ca3ce..ce25084 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -450,7 +450,8 @@ void RenderObject::drawBorder(QPainter *p, int x1, int y1, int x2, int y2,
     case DASHED:
         if(style == DASHED)
             p->setPen(QPen(c, width == 1 ? 0 : width, Qt::DashLine));
-        {
+
+        if (width > 0)
             switch(s)
             {
             case BSBottom:
@@ -462,7 +463,7 @@ void RenderObject::drawBorder(QPainter *p, int x1, int y1, int x2, int y2,
                 p->drawLine((x1+x2)/2, y1, (x1+x2)/2, y2);
                 break;
             }
-        }
+                
         break;
 
     case DOUBLE:

-- 
WebKit Debian packaging