Rename paint data structures

cc/playback/display_item_list.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_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/contiguous_container.h"
 #include "cc/base/rtree.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/discardable_image_map.h"
 #include "cc/playback/display_item.h"
 #include "cc/playback/display_item_list_settings.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
-class SkCanvas;
-
 namespace cc {
 class DisplayItem;
 
 class CC_EXPORT DisplayItemList
     : public base::RefCountedThreadSafe<DisplayItemList> {
  public:
   // Creates a display item list.
   static scoped_refptr<DisplayItemList> Create(
       const DisplayItemListSettings& settings);
 
   // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
-  void Raster(SkCanvas* canvas,
-              SkPicture::AbortCallback* callback,
+  void Raster(PaintCanvas* canvas,
+              PaintRecord::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
-  void Raster(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
-
+  void Raster(PaintCanvas* canvas, PaintRecord::AbortCallback* callback) const;
 
   // Because processing happens in these CreateAndAppend functions, all the set
   // up for the item should be done via the args, which is why the return type
   // needs to be const, to prevent set-after-processing mistakes.
 
   // Most paired begin item types default to an empty visual rect, which will
   // subsequently be grown as needed to encompass any contained items that draw
   // content, such as drawing or filter items.
   template <typename DisplayItemType, typename... Args>
   const DisplayItemType& CreateAndAppendPairedBeginItem(Args&&... args) {
@@ skipping 55 matching lines @@
   const DisplayItemType& CreateAndAppendDrawingItem(
       const gfx::Rect& visual_rect,
       Args&&... args) {
     inputs_.visual_rects.push_back(visual_rect);
     GrowCurrentBeginItemVisualRect(visual_rect);
 
     return AllocateAndConstruct<DisplayItemType>(std::forward<Args>(args)...);
   }
 
   // Called after all items are appended, to process the items and, if
-  // applicable, create an internally cached SkPicture.
+  // applicable, create an internally cached PaintRecord.
   void Finalize();
 
   void SetIsSuitableForGpuRasterization(bool is_suitable) {
     inputs_.all_items_are_suitable_for_gpu_rasterization = is_suitable;
   }
   bool IsSuitableForGpuRasterization() const;
 
   void SetImpliedColorSpace(const gfx::ColorSpace& implied_color_space) {
     inputs_.implied_color_space_specified = true;
     inputs_.implied_color_space = implied_color_space;
@@ skipping 84 matching lines @@
   Inputs inputs_;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_