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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 8309b740a7ae8501a7ed7448f2cf436a61205aec
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 5 23:06:42 2003 +0000

            Reviewed by John.
    
            * kwq/KWQPainter.mm:
            (QPainter::drawLine): Print a warning in debug builds when drawing
    	a dashed line. Also, revert accidental commenting of lines that
    	set the dash style.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b857d51..ed8338f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+        * kwq/KWQPainter.mm:
+        (QPainter::drawLine): Print a warning in debug builds when drawing
+	a dashed line. Also, revert accidental commenting of lines that
+	set the dash style.
+
 2003-08-04  Dave Hyatt  <hyatt at apple.com>
 
 	Fix for 3127909, copied text matched the document source instead of the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b857d51..ed8338f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+        * kwq/KWQPainter.mm:
+        (QPainter::drawLine): Print a warning in debug builds when drawing
+	a dashed line. Also, revert accidental commenting of lines that
+	set the dash style.
+
 2003-08-04  Dave Hyatt  <hyatt at apple.com>
 
 	Fix for 3127909, copied text matched the document source instead of the
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index a0874b1..33d3ab9 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -255,6 +255,8 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
     [graphicsContext setShouldAntialias: NO];
     
     if (patWidth) {
+	ERROR("Drawing a dashed line. This may trigger a CoreGraphics memory trasher.");
+
         // Do a rect fill of our endpoints.  This ensures we always have the
         // appearance of being a border.  We then draw the actual dotted/dashed line.
         if (x1 == x2) {
@@ -296,8 +298,8 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
             }
         }
         
-        //const float dottedLine[2] = { patWidth, patWidth };
-        //[path setLineDash:dottedLine count:2 phase:patternOffset];
+        const float dottedLine[2] = { patWidth, patWidth };
+        [path setLineDash:dottedLine count:2 phase:patternOffset];
     }
     
     [path moveToPoint:p1];

-- 
WebKit Debian packaging