Rename paint data structures

cc/playback/display_item.h

 // 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.
 
 #ifndef CC_PLAYBACK_DISPLAY_ITEM_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "cc/base/cc_export.h"
 #include "cc/debug/traced_value.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "ui/gfx/geometry/rect.h"
 
-class SkCanvas;
-
 namespace cc {
 
 class CC_EXPORT DisplayItem {
  public:
   enum Type {
     CLIP,
     END_CLIP,
     CLIP_PATH,
     END_CLIP_PATH,
     COMPOSITING,
     END_COMPOSITING,
     DRAWING,
     FILTER,
     END_FILTER,
     FLOAT_CLIP,
     END_FLOAT_CLIP,
     TRANSFORM,
     END_TRANSFORM,
   };
 
   virtual ~DisplayItem() {}
 
-  virtual sk_sp<const SkPicture> GetPicture() const;
-  virtual void Raster(SkCanvas* canvas,
-                      SkPicture::AbortCallback* callback) const = 0;
+  // TODO(enne): rename this to PaintRecord
+  virtual sk_sp<const PaintRecord> GetPicture() const;
+  virtual void Raster(PaintCanvas* canvas,
+                      PaintRecord::AbortCallback* callback) const = 0;
   virtual void AsValueInto(const gfx::Rect& visual_rect,
                            base::trace_event::TracedValue* array) const = 0;
 
   Type type() const { return type_; }
 
  protected:
   explicit DisplayItem(Type type) : type_(type) {}
 
   const Type type_;
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_H_