Rename paint data structures

cc/playback/compositing_display_item.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/playback/compositing_display_item.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #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"
 
 namespace cc {
 
 CompositingDisplayItem::CompositingDisplayItem(
     uint8_t alpha,
     SkBlendMode xfermode,
     SkRect* bounds,
     sk_sp<SkColorFilter> cf,
@@ skipping 60 matching lines @@
   if (color_filter_) {
     sk_sp<SkData> data(SkValidatingSerializeFlattenable(color_filter_.get()));
     if (data->size() > 0)
       details->set_color_filter(data->data(), data->size());
   }
 
   details->set_lcd_text_requires_opaque_layer(lcd_text_requires_opaque_layer_);
 }
 
 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_);
   const SkRect* bounds = has_bounds_ ? &bounds_ : nullptr;
   if (lcd_text_requires_opaque_layer_)
     canvas->saveLayer(bounds, &paint);
   else
     canvas->saveLayerPreserveLCDTextRequests(bounds, &paint);
 }
 
@@ skipping 22 matching lines @@
 }
 
 EndCompositingDisplayItem::~EndCompositingDisplayItem() {
 }
 
 void EndCompositingDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndCompositing);
 }
 
 void EndCompositingDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }
 
 void EndCompositingDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(
       base::StringPrintf("EndCompositingDisplayItem visualRect: [%s]",
                          visual_rect.ToString().c_str()));
 }
 
 }  // namespace cc