Changeset 23761 in webkit

Timestamp:

Jun 25, 2007 3:29:03 AM (17 years ago)

Author:

bdash

Message:

2007-06-25 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14245 Underline painted under <br>, not repainted properly

Test: fast/inline/br-text-decoration.html

• platform/graphics/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::drawLineForText): Added an early return if the line width is zero. Also changed the line stroke to a rect fill, so that lines with length shorter than their thickness paint correctly.

2007-06-25 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• pixel test for ​http://bugs.webkit.org/show_bug.cgi?id=14245 Underline painted under <br>, not repainted properly

• fast/inline/br-text-decoration-expected.checksum: Added.
• fast/inline/br-text-decoration-expected.png: Added.
• fast/inline/br-text-decoration-expected.txt: Added.
• fast/inline/br-text-decoration.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/br-text-decoration-expected.checksum (added)
• LayoutTests/fast/inline/br-text-decoration-expected.png (added)
• LayoutTests/fast/inline/br-text-decoration-expected.txt (added)
• LayoutTests/fast/inline/br-text-decoration.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-25  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - pixel test for http://bugs.webkit.org/show_bug.cgi?id=14245
+          Underline painted under <br>, not repainted properly
+
+        * fast/inline/br-text-decoration-expected.checksum: Added.
+        * fast/inline/br-text-decoration-expected.png: Added.
+        * fast/inline/br-text-decoration-expected.txt: Added.
+        * fast/inline/br-text-decoration.html: Added.
+
 2007-06-25  Matt Perry  <mpComplete@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-25  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14245
+          Underline painted under <br>, not repainted properly
+
+        Test: fast/inline/br-text-decoration.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::drawLineForText): Added an early return if the line width
+        is zero. Also changed the line stroke to a rect fill, so that lines with length shorter
+        than their thickness paint correctly.
+
 2007-06-25  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -708 +708 @@
         return;
 
+    if (width <= 0)
+        return;
+
     CGContextSaveGState(platformContext());
 
@@ -736 +739 @@
     }
     
-    CGContextSetLineWidth(platformContext(), thickness);
-
-    float halfThickness = thickness / 2;
-
-    // FIXME: How about using a rectangle fill instead of drawing a line?
-    CGPoint linePoints[2];
-    linePoints[0].x = x + halfThickness;
-    linePoints[0].y = y + halfThickness;
-    linePoints[1].x = x + lineLength - halfThickness;
-    linePoints[1].y = y + halfThickness;
-    CGContextStrokeLineSegments(platformContext(), linePoints, 2);
+    if (fillColor() != strokeColor())
+        setCGFillColor(platformContext(), strokeColor());
+    CGContextFillRect(platformContext(), CGRectMake(x, y, lineLength, thickness));
 
     CGContextRestoreGState(platformContext());