Rename paint data structures

cc/playback/filter_display_item.cc

Index: cc/playback/filter_display_item.cc
diff --git a/cc/playback/filter_display_item.cc b/cc/playback/filter_display_item.cc
index 41d87840fbbeb8a886f5ff75e431d3718e29ef23..cae346f5f4222c2673ebc613947698d87251ed20 100644
--- a/cc/playback/filter_display_item.cc
+++ b/cc/playback/filter_display_item.cc
@@ -9,11 +9,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/output/render_surface_filters.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/proto/gfx_conversions.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/skia_util.h"
 
@@ -58,8 +57,8 @@ void FilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   // TODO(dtrainor): Support serializing FilterOperations (crbug.com/541321).
 }
 
-void FilterDisplayItem::Raster(SkCanvas* canvas,
-                               SkPicture::AbortCallback* callback) const {
+void FilterDisplayItem::Raster(PaintCanvas* canvas,
+                               PaintRecord::AbortCallback* callback) const {
   canvas->save();
   canvas->translate(origin_.x(), origin_.y());
 
@@ -68,7 +67,7 @@ void FilterDisplayItem::Raster(SkCanvas* canvas,
   SkRect boundaries = RectFToSkRect(bounds_);
   boundaries.offset(-origin_.x(), -origin_.y());
 
-  SkPaint paint;
+  PaintFlags paint;
   paint.setBlendMode(SkBlendMode::kSrcOver);
   paint.setImageFilter(std::move(image_filter));
   canvas->saveLayer(&boundaries, &paint);
@@ -97,8 +96,8 @@ void EndFilterDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndFilter);
 }
 
-void EndFilterDisplayItem::Raster(SkCanvas* canvas,
-                                  SkPicture::AbortCallback* callback) const {
+void EndFilterDisplayItem::Raster(PaintCanvas* canvas,
+                                  PaintRecord::AbortCallback* callback) const {
   canvas->restore();
   canvas->restore();
 }