Rename paint data structures

cc/blink/web_display_item_list_impl.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/blink/web_display_item_list_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
+#include "cc/paint/paint_record.h"
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc_blink {
 
 namespace {
 
 scoped_refptr<cc::DisplayItemList> CreateUncachedDisplayItemListForBlink() {
   cc::DisplayItemListSettings settings;
   settings.use_cached_picture = false;
   return cc::DisplayItemList::Create(settings);
 }
 
 }  // namespace
 
 WebDisplayItemListImpl::WebDisplayItemListImpl()
     : display_item_list_(CreateUncachedDisplayItemListForBlink()) {
 }
 
 WebDisplayItemListImpl::WebDisplayItemListImpl(
     cc::DisplayItemList* display_list)
     : display_item_list_(display_list) {
 }
 
 void WebDisplayItemListImpl::appendDrawingItem(
     const blink::WebRect& visual_rect,
-    sk_sp<const SkPicture> picture) {
+    sk_sp<const cc::PaintRecord> picture) {
   display_item_list_->CreateAndAppendDrawingItem<cc::DrawingDisplayItem>(
       visual_rect, std::move(picture));
 }
 
 void WebDisplayItemListImpl::appendClipItem(
     const blink::WebRect& clip_rect,
     const blink::WebVector<SkRRect>& rounded_clip_rects) {
   std::vector<SkRRect> rounded_rects;
   for (size_t i = 0; i < rounded_clip_rects.size(); ++i) {
     rounded_rects.push_back(rounded_clip_rects[i]);
@@ skipping 98 matching lines @@
 
 void WebDisplayItemListImpl::setImpliedColorSpace(
     const gfx::ColorSpace& implied_color_space) {
   display_item_list_->SetImpliedColorSpace(implied_color_space);
 }
 
 WebDisplayItemListImpl::~WebDisplayItemListImpl() {
 }
 
 }  // namespace cc_blink