Rename paint data structures

cc/playback/transform_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/transform_display_item.h"
 
 #include <stddef.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 "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
 
 TransformDisplayItem::TransformDisplayItem(const gfx::Transform& transform)
     : DisplayItem(TRANSFORM), transform_(gfx::Transform::kSkipInitialization) {
   SetNew(transform);
 }
 
 TransformDisplayItem::TransformDisplayItem(const proto::DisplayItem& proto)
     : DisplayItem(TRANSFORM) {
@@ skipping 12 matching lines @@
   transform_ = transform;
 }
 
 void TransformDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_Transform);
 
   proto::TransformDisplayItem* details = proto->mutable_transform_item();
   TransformToProto(transform_, details->mutable_transform());
 }
 
-void TransformDisplayItem::Raster(SkCanvas* canvas,
-                                  SkPicture::AbortCallback* callback) const {
+void TransformDisplayItem::Raster(PaintCanvas* canvas,
+                                  PaintRecord::AbortCallback* callback) const {
   canvas->save();
   if (!transform_.IsIdentity())
     canvas->concat(transform_.matrix());
 }
 
 void TransformDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(base::StringPrintf(
       "TransformDisplayItem transform: [%s] visualRect: [%s]",
@@ skipping 10 matching lines @@
 }
 
 EndTransformDisplayItem::~EndTransformDisplayItem() {
 }
 
 void EndTransformDisplayItem::ToProtobuf(proto::DisplayItem* proto) const {
   proto->set_type(proto::DisplayItem::Type_EndTransform);
 }
 
 void EndTransformDisplayItem::Raster(
-    SkCanvas* canvas,
-    SkPicture::AbortCallback* callback) const {
+    PaintCanvas* canvas,
+    PaintRecord::AbortCallback* callback) const {
   canvas->restore();
 }
 
 void EndTransformDisplayItem::AsValueInto(
     const gfx::Rect& visual_rect,
     base::trace_event::TracedValue* array) const {
   array->AppendString(
       base::StringPrintf("EndTransformDisplayItem visualRect: [%s]",
                          visual_rect.ToString().c_str()));
 }
 
 }  // namespace cc