Commit a4512348 authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Chromium LUCI CQ

Revert "Use composited scrolling if resizer needs to be above descendants"

This reverts commit 7f72fc62.

Reason for revert: Caused P0 crbug.com/1155271.

Original change's description:
> Use composited scrolling if resizer needs to be above descendants
>
> A resizer on an element containing composited stacked descendants
> needs to be painted after the descendants. In pre-CompositeAfterPaint
> this can only be achieved by using composited scrolling for the element
> so that we'll composite the resizer even if the element is not
> scrollable.
>
> In CompositeAfterPaint everything is good because we always use the
> correct paint order.
>
> Bug: 1135676
> Change-Id: Ic69b830ae3d71cd9f6b8f55deca591b485b189a5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523748
> Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
> Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825613}

TBR=wangxianzhu@chromium.org,chrishtr@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1135676
Change-Id: Ie47558d1e9cbb1ed8f29e21286128899085be338
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583603Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835581}
parent f63587ac
...@@ -219,6 +219,7 @@ void CompositingInputsUpdater::UpdateSelfAndDescendantsRecursively( ...@@ -219,6 +219,7 @@ void CompositingInputsUpdater::UpdateSelfAndDescendantsRecursively(
descendant_has_direct_compositing_reason); descendant_has_direct_compositing_reason);
if ((layer->IsRootLayer() || layer->NeedsReorderOverlayOverflowControls()) && if ((layer->IsRootLayer() || layer->NeedsReorderOverlayOverflowControls()) &&
layer->ScrollsOverflow() &&
layer->DescendantHasDirectOrScrollingCompositingReason() && layer->DescendantHasDirectOrScrollingCompositingReason() &&
!layer->NeedsCompositedScrolling()) !layer->NeedsCompositedScrolling())
layer->GetScrollableArea()->UpdateNeedsCompositedScrolling(true); layer->GetScrollableArea()->UpdateNeedsCompositedScrolling(true);
...@@ -367,8 +368,7 @@ void CompositingInputsUpdater::UpdateAncestorInfo(PaintLayer* const layer, ...@@ -367,8 +368,7 @@ void CompositingInputsUpdater::UpdateAncestorInfo(PaintLayer* const layer,
// <div style="overflow:scroll;"> // <div style="overflow:scroll;">
// <div style="position:relative;">Paint sibling.</div> // <div style="position:relative;">Paint sibling.</div>
// </div> // </div>
if (layer->ScrollsOverflow() || if (layer->ScrollsOverflow()) {
layer->NeedsReorderOverlayOverflowControls()) {
info.scrolling_ancestor = layer; info.scrolling_ancestor = layer;
info.needs_reparent_scroll = true; info.needs_reparent_scroll = true;
} }
......
...@@ -2565,8 +2565,7 @@ bool PaintLayerScrollableArea::ComputeNeedsCompositedScrollingInternal( ...@@ -2565,8 +2565,7 @@ bool PaintLayerScrollableArea::ComputeNeedsCompositedScrollingInternal(
if (CompositingReasonFinder::RequiresCompositingForRootScroller(*layer_)) if (CompositingReasonFinder::RequiresCompositingForRootScroller(*layer_))
return true; return true;
if (!layer_->ScrollsOverflow() && if (!layer_->ScrollsOverflow())
!layer_->NeedsReorderOverlayOverflowControls())
return false; return false;
if (layer_->Size().IsEmpty()) if (layer_->Size().IsEmpty())
......
...@@ -38,6 +38,7 @@ crbug.com/802915 css3/blending/isolation-should-include-non-local-background.htm ...@@ -38,6 +38,7 @@ crbug.com/802915 css3/blending/isolation-should-include-non-local-background.htm
crbug.com/918155 virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbar-over-child-layer-nested-2.html [ Pass ] crbug.com/918155 virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbar-over-child-layer-nested-2.html [ Pass ]
crbug.com/918155 virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbar-over-child-layer-nested.html [ Pass ] crbug.com/918155 virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbar-over-child-layer-nested.html [ Pass ]
paint/invalidation/compositing/subpixel-offset-scaled-transform-composited.html [ Pass ] paint/invalidation/compositing/subpixel-offset-scaled-transform-composited.html [ Pass ]
crbug.com/1135676 external/wpt/css/css-ui/resize-child-will-change-transform.html [ Pass ]
# Raster invalidation doesn't work for huge layers. # Raster invalidation doesn't work for huge layers.
paint/invalidation/raster-under-invalidation-checking.html [ Failure ] paint/invalidation/raster-under-invalidation-checking.html [ Failure ]
......
...@@ -425,6 +425,9 @@ crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descenda ...@@ -425,6 +425,9 @@ crbug.com/1050993 [ Linux ] virtual/gpu-rasterization/images/drag-image-descenda
# Flaky test. # Flaky test.
crbug.com/1054894 [ Mac ] http/tests/images/image-decode-in-frame.html [ Pass Failure ] crbug.com/1054894 [ Mac ] http/tests/images/image-decode-in-frame.html [ Pass Failure ]
# Fixed in CompositeAfterPaint.
crbug.com/1135676 external/wpt/css/css-ui/resize-child-will-change-transform.html [ Failure ]
# ====== Paint team owned tests to here ====== # ====== Paint team owned tests to here ======
crbug.com/1142958 external/wpt/layout-instability/absolute-child-shift-with-parent-will-change.html [ Failure ] crbug.com/1142958 external/wpt/layout-instability/absolute-child-shift-with-parent-will-change.html [ Failure ]
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
"name": "Scrolling Contents Layer", "name": "Scrolling Contents Layer",
"bounds": [800, 600], "bounds": [800, 600],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF" "backgroundColor": "#FFFFFF",
"invalidations": [
[0, 50, 106, 106]
]
}, },
{ {
"name": "LayoutBlockFlow (positioned) DIV", "name": "LayoutBlockFlow (positioned) DIV",
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
"name": "Scrolling Contents Layer", "name": "Scrolling Contents Layer",
"bounds": [800, 600], "bounds": [800, 600],
"contentsOpaque": true, "contentsOpaque": true,
"backgroundColor": "#FFFFFF" "backgroundColor": "#FFFFFF",
"invalidations": [
[0, 50, 106, 106]
]
}, },
{ {
"name": "LayoutNGBlockFlow (positioned) DIV", "name": "LayoutNGBlockFlow (positioned) DIV",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment