Changeset 41152 in webkit

Timestamp:

Feb 23, 2009 12:11:05 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-02-23 Adam Treat <​adam.treat@torchmobile.com>

Reviewed by David Hyatt.

No testcases have been added or modified since this patch should not result in
a behavior change for ports that have layout tests enabled.

Currently, the implementation of GraphicsContext::drawLineForText amongst
the various ports differ in that some of them are honoring the context's
strokeStyle when drawing a text-decoration and some of them are not.
For instance, Apple's Mac port *does not* honor the context's strokeStyle(),
but the Cairo implementation does and has an explicit workaround that
sets the strokeStyle() temporarily.

This patch fixes so that all ports are consistent by explicitly making sure
to set the GraphicsContext strokeStyle to SolidStroke whenever
painting the text-decoration of an InlineFlowBox or InlineTextBox as these
should always use a solid stroke.

This patch addresses these bugs:
​https://bugs.webkit.org/show_bug.cgi?id=19364
​https://bugs.webkit.org/show_bug.cgi?id=15659

• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paintTextDecorations):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paintDecoration):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/InlineTextBox.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-23  Adam Treat  <adam.treat@torchmobile.com>
+
+        Reviewed by David Hyatt.
+
+        No testcases have been added or modified since this patch should not result in
+        a behavior change for ports that have layout tests enabled.
+
+        Currently, the implementation of GraphicsContext::drawLineForText amongst
+        the various ports differ in that some of them are honoring the context's
+        strokeStyle when drawing a text-decoration and some of them are not.
+        For instance, Apple's Mac port *does not* honor the context's strokeStyle(),
+        but the Cairo implementation does and has an explicit workaround that
+        sets the strokeStyle() temporarily.
+
+        This patch fixes so that all ports are consistent by explicitly making sure
+        to set the GraphicsContext strokeStyle to SolidStroke whenever
+        painting the text-decoration of an InlineFlowBox or InlineTextBox as these
+        should always use a solid stroke.
+
+        This patch addresses these bugs:
+        https://bugs.webkit.org/show_bug.cgi?id=19364
+        https://bugs.webkit.org/show_bug.cgi?id=15659
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paintTextDecorations):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintDecoration):
+
 2009-02-23  Scott Violet  <sky@google.com>
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -932 +932 @@
             if (paintUnderline) {
                 context->setStrokeColor(underline);
+                context->setStrokeStyle(SolidStroke);
                 // Leave one pixel of white between the baseline and the underline.
                 context->drawLineForText(IntPoint(tx, ty + baselinePos + 1), w, isPrinting);
@@ -937 +938 @@
             if (paintOverline) {
                 context->setStrokeColor(overline);
+                context->setStrokeStyle(SolidStroke);
                 context->drawLineForText(IntPoint(tx, ty), w, isPrinting);
             }
             if (paintLineThrough) {
                 context->setStrokeColor(linethrough);
+                context->setStrokeStyle(SolidStroke);
                 context->drawLineForText(IntPoint(tx, ty + 2 * baselinePos / 3), w, isPrinting);
             }

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -636 +636 @@
         if (deco & UNDERLINE) {
             context->setStrokeColor(underline);
+            context->setStrokeStyle(SolidStroke);
             // Leave one pixel of white between the baseline and the underline.
             context->drawLineForText(IntPoint(tx, ty + baseline + 1), width, isPrinting);
@@ -641 +642 @@
         if (deco & OVERLINE) {
             context->setStrokeColor(overline);
+            context->setStrokeStyle(SolidStroke);
             context->drawLineForText(IntPoint(tx, ty), width, isPrinting);
         }
         if (deco & LINE_THROUGH) {
             context->setStrokeColor(linethrough);
+            context->setStrokeStyle(SolidStroke);
             context->drawLineForText(IntPoint(tx, ty + 2 * baseline / 3), width, isPrinting);
         }