Rename paint data structures

cc/playback/clip_display_item.cc

 // Copyright 2014 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/clip_display_item.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event_argument.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 "ui/gfx/skia_util.h"
 
 namespace cc {
 class ImageSerializationProcessor;
 
 ClipDisplayItem::ClipDisplayItem(const gfx::Rect& clip_rect,
                                  const std::vector<SkRRect>& rounded_clip_rects,
                                  bool antialias)
     : DisplayItem(CLIP) {
   SetNew(clip_rect, rounded_clip_rects, antialias);
@@ skipping 29 matching lines @@
 
   proto::ClipDisplayItem* details = proto->mutable_clip_item();
   RectToProto(clip_rect_, details->mutable_clip_rect());
   DCHECK_EQ(0, details->rounded_rects_size());
   for (const auto& rrect : rounded_clip_rects_) {
     SkRRectToProto(rrect, details->add_rounded_rects());
   }
   details->set_antialias(antialias_);
 }
 
-void ClipDisplayItem::Raster(SkCanvas* canvas,
-                             SkPicture::AbortCallback* callback) const {
+void ClipDisplayItem::Raster(PaintCanvas* canvas,
+                             PaintRecord::AbortCallback* callback) const {
   canvas->save();
   canvas->clipRect(gfx::RectToSkRect(clip_rect_), antialias_);
   for (size_t i = 0; i < rounded_clip_rects_.size(); ++i) {
     if (rounded_clip_rects_[i].isRect()) {
       canvas->clipRect(rounded_clip_rects_[i].rect(), antialias_);
     } else {
       canvas->clipRRect(rounded_clip_rects_[i], antialias_);
     }
   }
 }
@@ skipping 33 matching lines @@
   DCHECK_EQ(proto::DisplayItem::Type_EndClip, proto.type());
 }
 
 EndClipDisplayItem::~EndClipDisplayItem() {
 }
 
 void EndClipDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndClip);
 }
 
-void EndClipDisplayItem::Raster(SkCanvas* canvas,
-                                SkPicture::AbortCallback* callback) const {
+void EndClipDisplayItem::Raster(PaintCanvas* canvas,
+                                PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }
 
 void EndClipDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(base::StringPrintf("EndClipDisplayItem visualRect: [%s]",
                                          visual_rect.ToString().c_str()));
 }
 
 }  // namespace cc