Rename paint data structures

third_party/WebKit/Source/platform/graphics/paint/DrawingDisplayItem.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 DrawingDisplayItem_h
 #define DrawingDisplayItem_h
 
 #include "base/compiler_specific.h"
 #include "platform/PlatformExport.h"
 #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 {
 
 class PLATFORM_EXPORT DrawingDisplayItem final : public DisplayItem {
  public:
   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)
                                                            : nullptr),
         m_knownToBeOpaque(knownToBeOpaque) {
     DCHECK(isDrawingType(type));
   }
 
   void replay(GraphicsContext&) const override;
   void appendToWebDisplayItemList(const IntRect&,
                                   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());
     return m_knownToBeOpaque;
   }
 
   void analyzeForGpuRasterization(SkPictureGpuAnalyzer&) const override;
 
  private:
 #ifndef NDEBUG
   void dumpPropertiesAsDebugString(WTF::StringBuilder&) const override;
 #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;
 };
 
 }  // namespace blink
 
 #endif  // DrawingDisplayItem_h