SPv2: Add support for tracking raster paint invalidations in testing.

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 44f06f71c39688b9e294c312eb2d608559822fb4..25be9b45dfd78e76616565ae2f1ae22c5aa994e0 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -2817,7 +2817,17 @@ void FrameView::pushPaintArtifactToCompositor() {
 
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
 
-  m_paintArtifactCompositor->update(m_paintController->paintArtifact());
+  m_paintArtifactCompositor->update(
+      m_paintController->paintArtifact(),
+      m_paintController->paintChunksRasterInvalidationTrackingMap());
+}
+
+std::unique_ptr<JSONObject> FrameView::compositedLayersAsJSON(
+    LayerTreeFlags flags) {
+  return frame()
+      .localFrameRoot()
+      ->view()
+      ->m_paintArtifactCompositor->layersAsJSON(flags);
 }
 
 void FrameView::updateStyleAndLayoutIfNeededRecursive() {
@@ -3204,8 +3214,15 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations) {
       layoutView.frameView()->m_trackedObjectPaintInvalidations = wrapUnique(
           trackPaintInvalidations ? new Vector<ObjectPaintInvalidation>
                                   : nullptr);
-      layoutView.compositor()->setTracksPaintInvalidations(
-          trackPaintInvalidations);
+      if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        m_paintController->setTracksRasterInvalidations(
+            trackPaintInvalidations);
+        m_paintArtifactCompositor->setTracksRasterInvalidations(
+            trackPaintInvalidations);
+      } else {
+        layoutView.compositor()->setTracksRasterInvalidations(
+            trackPaintInvalidations);
+      }
     }
   }