Rename paint data structures

third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp

 // 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 "platform/graphics/paint/PaintController.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 569 matching lines @@
 size_t PaintController::approximateUnsharedMemoryUsage() const {
   size_t memoryUsage = sizeof(*this);
 
   // Memory outside this class due to m_currentPaintArtifact.
   memoryUsage += m_currentPaintArtifact.approximateUnsharedMemoryUsage() -
                  sizeof(m_currentPaintArtifact);
 
   // TODO(jbroman): If display items begin to have significant external memory
   // usage that's not shared with the embedder, we should account for it here.
   //
-  // External objects, shared with the embedder, such as SkPicture, should be
+  // External objects, shared with the embedder, such as PaintRecord, should be
   // excluded to avoid double counting. It is the embedder's responsibility to
   // count such objects.
   //
   // At time of writing, the only known case of unshared external memory was
   // the rounded clips vector in ClipDisplayItem, which is not expected to
   // contribute significantly to memory usage.
 
   // Memory outside this class due to m_newDisplayItemList.
   DCHECK(m_newDisplayItemList.isEmpty());
   memoryUsage += m_newDisplayItemList.memoryUsageInBytes();
 
   return memoryUsage;
 }
 
 void PaintController::appendDebugDrawingAfterCommit(
     const DisplayItemClient& displayItemClient,
-    sk_sp<SkPicture> picture,
+    sk_sp<PaintRecord> picture,
     const LayoutSize& offsetFromLayoutObject) {
   DCHECK(m_newDisplayItemList.isEmpty());
   DrawingDisplayItem& displayItem =
       m_currentPaintArtifact.getDisplayItemList()
           .allocateAndConstruct<DrawingDisplayItem>(displayItemClient,
                                                     DisplayItem::kDebugDrawing,
                                                     std::move(picture));
   displayItem.setSkippedCache();
   // TODO(wkorman): Only compute and append visual rect for drawings.
   m_currentPaintArtifact.getDisplayItemList().appendVisualRect(
@@ skipping 142 matching lines @@
 #ifndef NDEBUG
   LOG(ERROR) << "New display item: " << newItem.asDebugString();
   LOG(ERROR) << "Old display item: "
              << (oldItem ? oldItem->asDebugString() : "None");
 #else
   LOG(ERROR) << "Run debug build to get more details.";
 #endif
   LOG(ERROR) << "See http://crbug.com/619103.";
 
 #ifndef NDEBUG
-  const SkPicture* newPicture =
+  const PaintRecord* newPicture =
       newItem.isDrawing()
           ? static_cast<const DrawingDisplayItem&>(newItem).picture()
           : nullptr;
-  const SkPicture* oldPicture =
+  const PaintRecord* oldPicture =
       oldItem && oldItem->isDrawing()
           ? static_cast<const DrawingDisplayItem*>(oldItem)->picture()
           : nullptr;
   LOG(INFO) << "new picture:\n"
             << (newPicture ? pictureAsDebugString(newPicture) : "None");
   LOG(INFO) << "old picture:\n"
             << (oldPicture ? pictureAsDebugString(oldPicture) : "None");
 
   showDebugData();
 #endif  // NDEBUG
@@ skipping 76 matching lines @@
               0, m_newDisplayItemList.size(),
               showPictures ? (DisplayItemList::JsonOptions::ShowPictures |
                               DisplayItemList::JsonOptions::ShowClientDebugName)
                            : DisplayItemList::JsonOptions::ShowClientDebugName)
           ->toPrettyJSONString()
           .utf8()
           .data());
 }
 
 }  // namespace blink