Maintain SkPaint in GraphicsContextState.

Source/platform/graphics/StrokeData.cpp

 // Copyright (C) 2013 Google Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
@@ skipping 39 matching lines @@
 
     size_t count = !(dashLength % 2) ? dashLength : dashLength * 2;
     OwnPtr<SkScalar[]> intervals = adoptArrayPtr(new SkScalar[count]);
 
     for (unsigned i = 0; i < count; i++)
         intervals[i] = dashes[i % dashLength];
 
     m_dash = adoptRef(new SkDashPathEffect(intervals.get(), count, dashOffset));
 }
 
-float StrokeData::setupPaint(SkPaint* paint, int length) const
+void StrokeData::setupPaint(SkPaint* paint, int length) const
 {
-    float width = m_thickness;
-
     paint->setStyle(SkPaint::kStroke_Style);
-    paint->setStrokeWidth(SkFloatToScalar(width));
+    paint->setStrokeWidth(SkFloatToScalar(m_thickness));
     paint->setStrokeCap(m_lineCap);
     paint->setStrokeJoin(m_lineJoin);
     paint->setStrokeMiter(SkFloatToScalar(m_miterLimit));
 
+    setupPaintDashPathEffect(paint, length);
+}
+
+void StrokeData::setupPaintDashPathEffect(SkPaint* paint, int length) const
+{
+    float width = m_thickness;
     if (m_dash) {
         paint->setPathEffect(m_dash.get());
     } else {
         switch (m_style) {
         case NoStroke:
         case SolidStroke:
         case DoubleStroke:
         case WavyStroke: // FIXME: https://code.google.com/p/chromium/issues/detail?id=229574
-            break;
+            paint->setPathEffect(0);
+            return;
         case DashedStroke:
             width = dashRatio * width;
             // Fall through.
         case DottedStroke:
             // Truncate the width, since we don't want fuzzy dots or dashes.
             int dashLength = static_cast<int>(width);
             // Subtract off the endcaps, since they're rendered separately.
             int distance = length - 2 * static_cast<int>(m_thickness);
             int phase = 1;
             if (dashLength > 1) {
                 // Determine how many dashes or dots we should have.
                 int numDashes = distance / dashLength;
                 int remainder = distance % dashLength;
                 // Adjust the phase to center the dashes within the line.
                 if (numDashes % 2) {
                     // Odd: shift right a full dash, minus half the remainder.
                     phase = dashLength - remainder / 2;
                 } else {
                     // Even: shift right half a dash, minus half the remainder.
                     phase = (dashLength - remainder) / 2;
                 }
             }
             SkScalar dashLengthSk = SkIntToScalar(dashLength);
             SkScalar intervals[2] = { dashLengthSk, dashLengthSk };
             RefPtr<SkDashPathEffect> pathEffect = adoptRef(new SkDashPathEffect(intervals, 2, SkIntToScalar(phase)));
             paint->setPathEffect(pathEffect.get());
         }
     }
-
-    return width;
 }
 
 } // namespace