WebKit side of merge from r41149 to r41181.

WebCore/rendering/InlineFlowBox.cpp

Index: WebCore/rendering/InlineFlowBox.cpp
===================================================================
--- WebCore/rendering/InlineFlowBox.cpp	(revision 10232)
+++ WebCore/rendering/InlineFlowBox.cpp	(working copy)
@@ -931,15 +931,18 @@
 
             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);
             }
             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);
             }
         } while (shadow);