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 1edc270122be422811e0b4743c3bb9ecc75c7a5a..cfad28344dbd0ef4f2a7eb8c4d7f49761e03638a 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -2804,6 +2804,11 @@ void FrameView::pushPaintArtifactToCompositor() |
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"); |
@@ -3148,7 +3153,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->setTracksPaintInvalidations(trackPaintInvalidations); |
+ m_paintArtifactCompositor->setTracksPaintInvalidations(trackPaintInvalidations); |
+ } else { |
+ layoutView.compositor()->setTracksPaintInvalidations(trackPaintInvalidations); |
+ } |
} |
} |