Commit 81248632 authored by Liviu Tinta's avatar Liviu Tinta Committed by Chromium LUCI CQ

Revert "Fix ScrollNestedLocalNonFastScrollableDiv under ScrollUnification"

This reverts commit 42509254.

Reason for revert: Test ScrollNestedLocalNonFastScrollableDiv becomes flaky.

Original change's description:
> Fix ScrollNestedLocalNonFastScrollableDiv under ScrollUnification
>
> With Scroll Unification, in LayerTreeImpl::DidUpdateScrollOffset there
> are cases where a ScrollUpdate may be mutating a ScrollNode that:
> - has a MainThreadScrollingReason - the main thread needs to repaint it
> each time we scroll.
> - it isn't composited
>
> In this case, when ScrollNode is mutated we don't want to make a
> corresponding change in the associated TransformNode. Instead, we want
> to SetNeedsCommit so that the changed offset in the ScrollNode is
> committed to the main thread, then blink regenerates its side of the
> property trees and cc::Layers.
>
> In this test, we hit the first case. In order for the test to pass we
> need to wait for the main thread to sync.
>
> Bug: 1086625
> Change-Id: Icdc3eb5cc786ebdecd516f3cb0fd58d47077d6ec
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585765
> Reviewed-by: Ken Buchanan <kenrb@chromium.org>
> Reviewed-by: David Bokan <bokan@chromium.org>
> Commit-Queue: Liviu Tinta <liviutinta@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#836593}

TBR=kenrb@chromium.org,bokan@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com,liviutinta@chromium.org

Change-Id: I935deae0ef3f55868d18e8f6406c9746404a375b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1086625
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2590426Reviewed-by: default avatarLiviu Tinta <liviutinta@chromium.org>
Commit-Queue: Liviu Tinta <liviutinta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836757}
parent f8197782
......@@ -885,7 +885,8 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessInternalsHitTestBrowserTest,
// Wait until renderer's compositor thread is synced. Otherwise the non fast
// scrollable regions won't be set when the event arrives.
RunUntilInputProcessed(rwhv_nested->GetRenderWidgetHost());
MainThreadFrameObserver observer(rwhv_nested->GetRenderWidgetHost());
observer.Wait();
// Send a wheel to scroll the div.
gfx::Point location(point_f.x(), point_f.y());
......@@ -902,9 +903,6 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessInternalsHitTestBrowserTest,
rwhv_root->OnScrollEvent(&scroll_event);
ack_observer.Wait();
// Wait until renderer's main thread is synced.
RunUntilInputProcessed(rwhv_nested->GetRenderWidgetHost());
// Verify the div scrolled.
double div_scroll_top = div_scroll_top_start;
EXPECT_TRUE(ExecuteScriptAndExtractDouble(
......
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