| 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 6e8030fca4ea558c1c7cc5a6ddd66c0f999ffc1b..8297eaacf001f5b7ac2c228736891b1dcf89f3e6 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -3100,18 +3100,19 @@ void FrameView::updateLifecyclePhasesInternal(
|
| RuntimeEnabledFeatures::printBrowserEnabled())
|
| paintTree();
|
|
|
| - if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
|
| - pushPaintArtifactToCompositor();
|
| + if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
|
| + Optional<CompositorElementIdSet> compositedElementIds =
|
| + CompositorElementIdSet();
|
| + pushPaintArtifactToCompositor(compositedElementIds.value());
|
| + DocumentAnimations::updateAnimations(layoutView()->document(),
|
| + DocumentLifecycle::PaintClean,
|
| + compositedElementIds);
|
| + }
|
|
|
| DCHECK(!view.hasPendingSelection());
|
| DCHECK((m_frame->document()->printing() &&
|
| lifecycle().state() == DocumentLifecycle::PrePaintClean) ||
|
| lifecycle().state() == DocumentLifecycle::PaintClean);
|
| -
|
| - if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
|
| - DocumentAnimations::updateAnimations(layoutView()->document(),
|
| - DocumentLifecycle::PaintClean);
|
| - }
|
| }
|
|
|
| forAllNonThrottledFrameViews([](FrameView& frameView) {
|
| @@ -3248,7 +3249,8 @@ void FrameView::paintGraphicsLayerRecursively(GraphicsLayer* graphicsLayer) {
|
| paintGraphicsLayerRecursively(child);
|
| }
|
|
|
| -void FrameView::pushPaintArtifactToCompositor() {
|
| +void FrameView::pushPaintArtifactToCompositor(
|
| + CompositorElementIdSet& compositedElementIds) {
|
| TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor");
|
|
|
| DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
|
| @@ -3269,7 +3271,8 @@ void FrameView::pushPaintArtifactToCompositor() {
|
| m_paintArtifactCompositor->update(
|
| m_paintController->paintArtifact(),
|
| m_paintController->paintChunksRasterInvalidationTrackingMap(),
|
| - m_isStoringCompositedLayerDebugInfo, *m_geometryMapper);
|
| + m_isStoringCompositedLayerDebugInfo, *m_geometryMapper,
|
| + compositedElementIds);
|
| }
|
|
|
| std::unique_ptr<JSONObject> FrameView::compositedLayersAsJSON(
|
|
|