Rename paint data structures

third_party/WebKit/Source/modules/canvas2d/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 10 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CanvasStyle_h
 #define CanvasStyle_h
 
 #include "platform/graphics/Color.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/WTFString.h"
 
-class SkPaint;
-
 namespace blink {
 
 class CanvasGradient;
 class CanvasPattern;
 class HTMLCanvasElement;
 
 class CanvasStyle final : public GarbageCollected<CanvasStyle> {
  public:
   static CanvasStyle* createFromRGBA(RGBA32 rgba) {
     return new CanvasStyle(rgba);
   }
   static CanvasStyle* createFromGradient(CanvasGradient*);
   static CanvasStyle* createFromPattern(CanvasPattern*);
 
   String color() const {
     ASSERT(m_type == ColorRGBA);
     return Color(m_rgba).serialized();
   }
   CanvasGradient* getCanvasGradient() const { return m_gradient.get(); }
   CanvasPattern* getCanvasPattern() const { return m_pattern; }
 
-  void applyToPaint(SkPaint&) const;
+  void applyToPaint(PaintFlags&) 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);
   CanvasStyle(CanvasGradient*);
   CanvasStyle(CanvasPattern*);
 
   Type m_type;
   RGBA32 m_rgba;
 
   Member<CanvasGradient> m_gradient;
   Member<CanvasPattern> m_pattern;
 };
 
 bool parseColorOrCurrentColor(Color& parsedColor,
                               const String& colorString,
                               HTMLCanvasElement*);
 
 }  // namespace blink
 
 #endif