Move color/gradient/pattern out of StrokeData

Source/platform/graphics/GraphicsContextState.h

 // 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 50 matching lines @@
     // SkPaint objects that reflect the current state. If the length of the
     // path to be stroked is known, pass it in for correct dash or dot placement.
     const SkPaint& strokePaint(int strokedPathLength = 0) const;
     const SkPaint& fillPaint() const;
 
     uint16_t saveCount() const { return m_saveCount; }
     void incrementSaveCount() { ++m_saveCount; }
     void decrementSaveCount() { --m_saveCount; }
 
     // Stroke data
-    const StrokeData& strokeData() const { return m_strokeData; }
-
-    void setStrokeStyle(StrokeStyle);
-
-    void setStrokeThickness(float);
-
-    SkColor effectiveStrokeColor() const { return applyAlpha(m_strokeData.color().rgb()); }
+    Color strokeColor() const { return m_strokeColor; }
+    SkColor effectiveStrokeColor() const { return applyAlpha(m_strokeColor.rgb()); }
     void setStrokeColor(const Color&);
 
+    Gradient* strokeGradient() const { return m_strokeGradient.get(); }
     void setStrokeGradient(const PassRefPtr<Gradient>);
     void clearStrokeGradient();
 
+    Pattern* strokePattern() const { return m_strokePattern.get(); }
     void setStrokePattern(const PassRefPtr<Pattern>);
     void clearStrokePattern();
 
+    const StrokeData& strokeData() const { return m_strokeData; }
+    void setStrokeStyle(StrokeStyle);
+    void setStrokeThickness(float);
     void setLineCap(LineCap);
-
     void setLineJoin(LineJoin);
-
     void setMiterLimit(float);
-
     void setLineDash(const DashArray&, float);
 
     // Fill data
     Color fillColor() const { return m_fillColor; }
     SkColor effectiveFillColor() const { return applyAlpha(m_fillColor.rgb()); }
     void setFillColor(const Color&);
 
     Gradient* fillGradient() const { return m_fillGradient.get(); }
     void setFillGradient(const PassRefPtr<Gradient>);
     void clearFillGradient();
@@ skipping 49 matching lines @@
         int a = SkAlphaMul(SkColorGetA(c), m_alpha);
         return (c & 0x00FFFFFF) | (a << 24);
     }
 
     // These are mutbale to enable gradient updates when the paints are fetched for use.
     mutable SkPaint m_strokePaint;
     mutable SkPaint m_fillPaint;
 
     StrokeData m_strokeData;
 
+    Color m_strokeColor;
+    RefPtr<Gradient> m_strokeGradient;
+    RefPtr<Pattern> m_strokePattern;
+
     Color m_fillColor;
     WindRule m_fillRule;
     RefPtr<Gradient> m_fillGradient;
     RefPtr<Pattern> m_fillPattern;
 
     RefPtr<SkDrawLooper> m_looper;
 
     TextDrawingModeFlags m_textDrawingMode;
 
     int m_alpha;
     RefPtr<SkColorFilter> m_colorFilter;
 
     CompositeOperator m_compositeOperator;
     WebBlendMode m_blendMode;
 
     InterpolationQuality m_interpolationQuality;
 
     uint16_t m_saveCount;
 
     bool m_shouldAntialias : 1;
     bool m_shouldClampToSourceRect : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContextState_h