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 da45f497399287fceef5e92e16dc841a4a9456e8..012f2b1e8baf7f008436f5e982db6b6843c4bcd0 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -2799,7 +2799,12 @@ 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 m_paintArtifactCompositor->layersAsJSON(flags);
 }
 
 void FrameView::updateStyleAndLayoutIfNeededRecursive()
@@ -3146,7 +3151,12 @@ void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
             continue;
         if (LayoutViewItem layoutView = toLocalFrame(frame)->contentLayoutItem()) {
             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);
+            }
         }
     }