Rename paint data structures

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h

Index: third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h
index 06429cc56c488c5ef282871a8ff449f082be7bbb..a21ec1128f9fce3a98eb958739ac047db4c04c88 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.h
@@ -10,7 +10,7 @@
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/graphics/paint/DisplayItem.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace blink {
@@ -20,7 +20,7 @@ class PLATFORM_EXPORT DrawingDisplayItem final : public DisplayItem {
   DISABLE_CFI_PERF
   DrawingDisplayItem(const DisplayItemClient& client,
                      Type type,
-                     sk_sp<const SkPicture> picture,
+                     sk_sp<const PaintRecord> picture,
                      bool knownToBeOpaque = false)
       : DisplayItem(client, type, sizeof(*this)),
         m_picture(picture && picture->approximateOpCount() ? std::move(picture)
@@ -34,7 +34,8 @@ class PLATFORM_EXPORT DrawingDisplayItem final : public DisplayItem {
                                   WebDisplayItemList*) const override;
   bool drawsContent() const override;
 
-  const SkPicture* picture() const { return m_picture.get(); }
+  // TODO(enne): rename this to PaintRecord

[danakj, 2017/01/25 17:33:29]

GetPaintRecord I guess, or it'll collide in the blink rewrite :)

+  const PaintRecord* picture() const { return m_picture.get(); }
 
   bool knownToBeOpaque() const {
     DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
@@ -49,7 +50,7 @@ class PLATFORM_EXPORT DrawingDisplayItem final : public DisplayItem {
 #endif
   bool equals(const DisplayItem& other) const final;
 
-  sk_sp<const SkPicture> m_picture;
+  sk_sp<const PaintRecord> m_picture;
 
   // True if there are no transparent areas. Only used for SlimmingPaintV2.
   const bool m_knownToBeOpaque;