Rename paint data structures

third_party/WebKit/Source/platform/graphics/Image.h

Index: third_party/WebKit/Source/platform/graphics/Image.h
diff --git a/third_party/WebKit/Source/platform/graphics/Image.h b/third_party/WebKit/Source/platform/graphics/Image.h
index 773e56e9947b59bf68e7b0320cbb4ddcf6d1f19c..a6489aa613110fac76d62d4e70f733dc3f28c652 100644
--- a/third_party/WebKit/Source/platform/graphics/Image.h
+++ b/third_party/WebKit/Source/platform/graphics/Image.h
@@ -36,6 +36,8 @@
 #include "platform/graphics/ImageAnimationPolicy.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/ImageOrientation.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Assertions.h"
 #include "wtf/Noncopyable.h"
@@ -44,10 +46,8 @@
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/text/WTFString.h"
 
-class SkCanvas;
 class SkImage;
 class SkMatrix;
-class SkPaint;
 
 namespace blink {
 
@@ -160,15 +160,15 @@ class PLATFORM_EXPORT Image : public ThreadSafeRefCounted<Image> {
     DoNotClampImageToSourceRect
   };
 
-  virtual void draw(SkCanvas*,
-                    const SkPaint&,
+  virtual void draw(PaintCanvas*,
+                    const PaintFlags&,
                     const FloatRect& dstRect,
                     const FloatRect& srcRect,
                     RespectImageOrientationEnum,
                     ImageClampingMode,
                     const ColorBehavior&) = 0;
 
-  virtual bool applyShader(SkPaint&,
+  virtual bool applyShader(PaintFlags&,
                            const SkMatrix& localMatrix,
                            const ColorBehavior&);