Rename paint data structures

cc/playback/compositing_display_item.cc

Index: cc/playback/compositing_display_item.cc
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc
index 628ab5617aa9fcb8f685090b72a60bdc8924e6cc..adb07fd5a6bd1d6c31ff8cef290e17fa80c2fd23 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -9,11 +9,10 @@
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
+#include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkFlattenable.h"
 #include "third_party/skia/include/core/SkFlattenableSerialization.h"
-#include "third_party/skia/include/core/SkPaint.h"
 
 #include "ui/gfx/skia_util.h"
 
@@ -48,9 +47,9 @@ void CompositingDisplayItem::SetNew(uint8_t alpha,
 }
 
 void CompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
-  SkPaint paint;
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
+  PaintFlags paint;
   paint.setBlendMode(xfermode_);
   paint.setAlpha(alpha_);
   paint.setColorFilter(color_filter_);
@@ -83,8 +82,8 @@ EndCompositingDisplayItem::~EndCompositingDisplayItem() {
 }
 
 void EndCompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }