[SPv175] Count paint invalidator and subsequence memory usage

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: If60370c0af378fa1d0a4f970d3cf3fe0f2f4925b
Reviewed-on: https://chromium-review.googlesource.com/1011234Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550410}

third_party/blink/renderer/platform/graphics/compositing/composited_layer_raster_invalidator.cc

@@ -308,4 +308,9 @@ void CompositedLayerRasterInvalidator::Generate(
   }
 }
 
+size_t CompositedLayerRasterInvalidator::ApproximateUnsharedMemoryUsage()
+    const {
+  return sizeof(*this) + paint_chunks_info_.capacity() * sizeof(PaintChunkInfo);
+}
+
 }  // namespace blink

third_party/blink/renderer/platform/graphics/compositing/composited_layer_raster_invalidator.h

@@ -46,6 +46,8 @@ class PLATFORM_EXPORT CompositedLayerRasterInvalidator {
 
   const gfx::Rect& LayerBounds() const { return layer_bounds_; }
 
+  size_t ApproximateUnsharedMemoryUsage() const;
+
  private:
   friend class CompositedLayerRasterInvalidatorTest;
 

third_party/blink/renderer/platform/graphics/graphics_layer.cc

@@ -1437,7 +1437,11 @@ void GraphicsLayer::PaintContents(WebDisplayItemList* web_display_item_list,
 }
 
 size_t GraphicsLayer::ApproximateUnsharedMemoryUsage() const {
-  return GetPaintController().ApproximateUnsharedMemoryUsage();
+  size_t result = sizeof(*this);
+  result += GetPaintController().ApproximateUnsharedMemoryUsage();
+  if (raster_invalidator_)
+    result += raster_invalidator_->ApproximateUnsharedMemoryUsage();
+  return result;
 }
 
 bool ScopedSetNeedsDisplayInRectForTrackingOnly::s_enabled_ = false;

third_party/blink/renderer/platform/graphics/paint/paint_controller.cc

@@ -679,7 +679,7 @@ void PaintController::CommitNewDisplayItems() {
 size_t PaintController::ApproximateUnsharedMemoryUsage() const {
   size_t memory_usage = sizeof(*this);
 
-  // Memory outside this class due to m_currentPaintArtifact.
+  // Memory outside this class due to current_paint_artifact_.
   memory_usage += current_paint_artifact_.ApproximateUnsharedMemoryUsage() -
                   sizeof(current_paint_artifact_);
 
@@ -694,10 +694,18 @@ size_t PaintController::ApproximateUnsharedMemoryUsage() const {
   // the rounded clips vector in ClipDisplayItem, which is not expected to
   // contribute significantly to memory usage.
 
-  // Memory outside this class due to m_newDisplayItemList.
+  // Memory outside this class due to new_display_item_list_.
   DCHECK(new_display_item_list_.IsEmpty());
   memory_usage += new_display_item_list_.MemoryUsageInBytes();
 
+  // Memory outside this class due to current_cached_subsequences_ and
+  // new_cached_subsequences_.
+  memory_usage += current_cached_subsequences_.Capacity() *
+                  sizeof(*current_cached_subsequences_.begin());
+  DCHECK(new_cached_subsequences_.IsEmpty());
+  memory_usage += new_cached_subsequences_.Capacity() *
+                  sizeof(*new_cached_subsequences_.begin());
+
   return memory_usage;
 }
 

third_party/blink/renderer/platform/graphics/paint/paint_controller.h

@@ -161,7 +161,7 @@ class PLATFORM_EXPORT PaintController {
 
   // Returns the approximate memory usage, excluding memory likely to be
   // shared with the embedder after copying to WebPaintController.
-  // Should only be called right after commitNewDisplayItems.
+  // Should only be called after a full document life cycle update.
   size_t ApproximateUnsharedMemoryUsage() const;
 
   // Get the artifact generated after the last commit.