WebKit side of merge from r41149 to r41181.

WebCore/rendering/InlineTextBox.cpp

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