| Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| index 97d50d2ac04496e4056d86c0114fb5a7acd8e20f..1610e0da52fb3049e4cf19a871a65a1c79696554 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| @@ -570,6 +570,10 @@ void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded()
|
| if (!RuntimeEnabledFeatures::touchEnabled())
|
| return;
|
|
|
| + // TODO(chrishtr): implement touch event target rects for SPv2.
|
| + if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
|
| + return;
|
| +
|
| LayerHitTestRects touchEventTargetRects;
|
| computeTouchEventTargetRects(touchEventTargetRects);
|
| setTouchEventTargetRects(touchEventTargetRects);
|
| @@ -685,13 +689,13 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh
|
| m_lastMainThreadScrollingReasons = mainThreadScrollingReasons;
|
| if (mainThreadScrollingReasons) {
|
| if (ScrollAnimatorBase* scrollAnimator = layer->getScrollableArea()->existingScrollAnimator()) {
|
| - DCHECK(m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| + DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled() || m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| scrollAnimator->takeOverCompositorAnimation();
|
| }
|
| scrollLayer->addMainThreadScrollingReasons(mainThreadScrollingReasons);
|
| if (visualViewportScrollLayer) {
|
| if (ScrollAnimatorBase* scrollAnimator = visualViewportLayer->getScrollableArea()->existingScrollAnimator()) {
|
| - DCHECK(m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| + DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled() || m_page->deprecatedLocalMainFrame()->document()->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| scrollAnimator->takeOverCompositorAnimation();
|
| }
|
| visualViewportScrollLayer->addMainThreadScrollingReasons(mainThreadScrollingReasons);
|
|
|