Rename paint data structures

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

Index: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
index c0ad01ba7c12a532abefb7cb88f314b7b2a30793..eb9d41c2bceb1719719f8a84e1dd7c6b6fc4db9f 100644
--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
@@ -34,9 +34,10 @@
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/StaticBitmapImage.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/WTFString.h"
@@ -260,8 +261,8 @@ String BitmapImage::filenameExtension() const {
 }
 
 void BitmapImage::draw(
-    SkCanvas* canvas,
-    const SkPaint& paint,
+    PaintCanvas* canvas,
+    const PaintFlags& paint,
     const FloatRect& dstRect,
     const FloatRect& srcRect,
     RespectImageOrientationEnum shouldRespectImageOrientation,
@@ -283,7 +284,7 @@ void BitmapImage::draw(
   if (shouldRespectImageOrientation == RespectImageOrientation)
     orientation = frameOrientationAtIndex(m_currentFrame);
 
-  SkAutoCanvasRestore autoRestore(canvas, false);
+  PaintCanvasAutoRestore autoRestore(canvas, false);
   FloatRect adjustedDstRect = dstRect;
   if (orientation != DefaultImageOrientation) {
     canvas->save();