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

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

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 2fc86456311b0382a23b1f0838c3974991a6c542..b1527dffff455b0cf8839d75845c4ea84f917a41 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -778,18 +778,22 @@ String LocalFrame::layerTreeAsText(unsigned flags) const
     if (contentLayoutItem().isNull())
         return String();
 
-    std::unique_ptr<JSONObject> layerTree = contentLayoutItem().compositor()->layerTreeAsJSON(static_cast<LayerTreeFlags>(flags));
+    std::unique_ptr<JSONObject> layers;
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        layers = view()->compositedLayersAsJSON(static_cast<LayerTreeFlags>(flags));
+    else
+        layers = contentLayoutItem().compositor()->layerTreeAsJSON(static_cast<LayerTreeFlags>(flags));
 
     if (flags & LayerTreeIncludesPaintInvalidations) {
         std::unique_ptr<JSONArray> objectPaintInvalidations = m_view->trackedObjectPaintInvalidationsAsJSON();
         if (objectPaintInvalidations && objectPaintInvalidations->size()) {
-            if (!layerTree)
-                layerTree = JSONObject::create();
-            layerTree->setArray("objectPaintInvalidations", std::move(objectPaintInvalidations));
+            if (!layers)
+                layers = JSONObject::create();
+            layers->setArray("objectPaintInvalidations", std::move(objectPaintInvalidations));
         }
     }
 
-    return layerTree ? layerTree->toPrettyJSONString() : String();
+    return layers ? layers->toPrettyJSONString() : String();
 }
 
 bool LocalFrame::shouldThrottleRendering() const