Move SkPaint mangement for 2D canvas into CanvasRenderingContext2DState

Source/core/html/canvas/CanvasStyle.h

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 
 #ifndef CanvasStyle_h
 #define CanvasStyle_h
 
 #include "platform/graphics/Color.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
+class SkShader;
+
 namespace blink {
 
     class CanvasGradient;
     class CanvasPattern;
     class GraphicsContext;
     class HTMLCanvasElement;
 
     class CanvasStyle final : public RefCountedWillBeGarbageCollected<CanvasStyle> {
     public:
         static PassRefPtrWillBeRawPtr<CanvasStyle> createFromRGBA(RGBA32 rgba) { return adoptRefWillBeNoop(new CanvasStyle(rgba)); }
         static PassRefPtrWillBeRawPtr<CanvasStyle> createFromGradient(PassRefPtrWillBeRawPtr<CanvasGradient>);
         static PassRefPtrWillBeRawPtr<CanvasStyle> createFromPattern(PassRefPtrWillBeRawPtr<CanvasPattern>);
 
         String color() const { ASSERT(m_type == ColorRGBA); return Color(m_rgba).serialized(); }
         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; }
 
         DECLARE_TRACE();
 
     private:
         enum Type { ColorRGBA, Gradient, ImagePattern };
 
         CanvasStyle(RGBA32 rgba);
         CanvasStyle(PassRefPtrWillBeRawPtr<CanvasGradient>);
         CanvasStyle(PassRefPtrWillBeRawPtr<CanvasPattern>);
 
         Type m_type;
         RGBA32 m_rgba;
 
         RefPtrWillBeMember<CanvasGradient> m_gradient;
         RefPtrWillBeMember<CanvasPattern> m_pattern;
     };
 
     bool parseColorOrCurrentColor(RGBA32& parsedColor, const String& colorString, HTMLCanvasElement*);
 
 } // namespace blink
 
 #endif