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

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 2786 matching lines @@
     if (!m_paintArtifactCompositor) {
         m_paintArtifactCompositor = PaintArtifactCompositor::create();
         page->chromeClient().attachRootLayer(m_paintArtifactCompositor->getWebLayer(), &frame());
     }
 
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
 
     m_paintArtifactCompositor->update(m_paintController->paintArtifact());
 }
 
+std::unique_ptr<JSONObject> FrameView::compositedLayersAsJSON(LayerTreeFlags flags)
+{
+    return m_paintArtifactCompositor->layersAsJSON(flags);
+}
+
 void FrameView::updateStyleAndLayoutIfNeededRecursive()
 {
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.StyleAndLayout.UpdateTime");
     updateStyleAndLayoutIfNeededRecursiveInternal();
 }
 
 void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal()
 {
     if (shouldThrottleRendering() || !m_frame->document()->isActive())
         return;
@@ skipping 324 matching lines @@
 void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
 {
     if (trackPaintInvalidations == isTrackingPaintInvalidations())
         return;
 
     for (Frame* frame = m_frame->tree().top(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
             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->setTracksPaintInvalidations(trackPaintInvalidations);
+                m_paintArtifactCompositor->setTracksPaintInvalidations(trackPaintInvalidations);
+            } else {
+                layoutView.compositor()->setTracksPaintInvalidations(trackPaintInvalidations);
+            }
         }
     }
 
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("blink.invalidation"),
         "FrameView::setTracksPaintInvalidations", TRACE_EVENT_SCOPE_GLOBAL, "enabled", trackPaintInvalidations);
 }
 
 void FrameView::trackObjectPaintInvalidation(const DisplayItemClient& client, PaintInvalidationReason reason)
 {
     if (!m_trackedObjectPaintInvalidations)
@@ skipping 1257 matching lines @@
 }
 
 bool FrameView::canThrottleRendering() const
 {
     if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
         return false;
     return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrottling);
 }
 
 } // namespace blink