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 e2eab3b005dc56e799c223a18e0b51a8734e54e7..48e2dcd75e786a73b3f6630d8fa6a5678dacf81f 100644
--- a/cc/playback/compositing_display_item.cc
+++ b/cc/playback/compositing_display_item.cc
@@ -9,14 +9,13 @@
 
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/skia_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.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"
 
@@ -97,9 +96,9 @@ void CompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
 }
 
 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_);
@@ -142,8 +141,8 @@ void EndCompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
 }
 
 void EndCompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }