Move SkPaint mangement for 2D canvas into CanvasRenderingContext2DState

Source/core/html/canvas/CanvasStyle.h

Index: Source/core/html/canvas/CanvasStyle.h
diff --git a/Source/core/html/canvas/CanvasStyle.h b/Source/core/html/canvas/CanvasStyle.h
index cdcb7f673a533019c8fdbebd93fab353090d987b..94ec768ad07cfd2593b0bc7345b5214eea9b95c9 100644
--- a/Source/core/html/canvas/CanvasStyle.h
+++ b/Source/core/html/canvas/CanvasStyle.h
@@ -33,6 +33,8 @@
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
+class SkShader;
+
 namespace blink {
 
     class CanvasGradient;
@@ -50,8 +52,10 @@ namespace blink {
         CanvasGradient* canvasGradient() const { return m_gradient.get(); }
         CanvasPattern* canvasPattern() const { return m_pattern.get(); }
 
-        void applyFillColor(GraphicsContext*);
-        void applyStrokeColor(GraphicsContext*);
+        void applyFillColor(GraphicsContext*); // Deprecated
+        void applyStrokeColor(GraphicsContext*); // Deprecated
+        SkShader* shader() const;
+        RGBA32 paintColor() const;
 
         bool isEquivalentRGBA(RGBA32 rgba) const { return m_type == ColorRGBA && m_rgba == rgba; }