Skip to content

Commit

Permalink
Revert "Reland "Correctly initialize and test SnapContainerData in cc.""
Browse files Browse the repository at this point in the history
This reverts commit 043b97cee41154a32d6c1cd8965075813a9ba672.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Reland "Correctly initialize and test SnapContainerData in cc."
>
> This reverts commit 0fc70abb02f52598f0f98eafd7001490545bc0c9.
>
> Reason for revert: <INSERT REASONING HERE>
>
> Original change's description:
> > Revert "Correctly initialize and test SnapContainerData in cc."
> >
> > This reverts commit 37061f875b167ab82f1a0ddca84b510b7c6802dc.
> >
> > Reason for revert:
> > The layout tests added by this CL is failing on the CL:
> > https://ci.chromium.org/buildbot/chromium.webkit/WebKit%20Win10/37804
> >
> > Original change's description:
> > > Correctly initialize and test SnapContainerData in cc.
> > >
> > > This patch initializes the rect_ field in SnapContainerData in copy
> > > constructor and move constructor. Fixing a snapping issue in the
> > > composited pages.
> > >
> > > We also adds external/wpt/css/css-scroll-snap/ to the virtual/threaded
> > > test suite so that they are tested with the composited cases.
> > >
> > > snap-at-user-scroll-end-manual-automation.js calls
> > > mouseClickInTarget() of pointerevent_common_input.js. That method
> > > invokes programmatic scrolls. The test was written before programmatic
> > > scroll snapping was implemented so it worked at that time. However,
> > > with programmatic scroll snapping implemented, it will always snap
> > > in mouseClickIntarget() and cannot test whether the user scroll snaps.
> > > This patch adds a parameter shouldScrollToTarget to mouseClickInTarget
> > > to avoid invoking programmatic scrolls in the test.
> > >
> > > This patch also checks nullptr for layout_box in
> > > ScrollManager::SnapAtGestureScrollEnd() to fix a crash.
> > >
> > > Bug: 862406, 862571
> > > Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
> > > Change-Id: I6a53818cf74421a4100ad6f908158abf302a5b8e
> > > Reviewed-on: https://chromium-review.googlesource.com/1132386
> > > Commit-Queue: Sandra Sun <[email protected]>
> > > Reviewed-by: Majid Valipour <[email protected]>
> > > Reviewed-by: Robert Flack <[email protected]>
> > > Cr-Commit-Position: refs/heads/master@{#574781}
> >
> > [email protected],[email protected],[email protected]
> >
> > Change-Id: I55c77c05c0381c8ac638bd106d2d18b1b4332745
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 862406, 862571
> > Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
> > Reviewed-on: https://chromium-review.googlesource.com/1136171
> > Reviewed-by: Taiju Tsuiki <[email protected]>
> > Commit-Queue: Taiju Tsuiki <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#574825}
>
> [email protected],[email protected],[email protected],[email protected]
>
> Change-Id: I4a9480b68c15e0dfcfd13df6ed6c0e6b8ab5a8e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 862406, 862571
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
> Reviewed-on: https://chromium-review.googlesource.com/1136671
> Reviewed-by: Sandra Sun <[email protected]>
> Commit-Queue: Sandra Sun <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#574926}

[email protected],[email protected],[email protected],[email protected]

Change-Id: If9d1e6f73393a7dddc9f8f418606946f070b45be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 862406, 862571
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1136612
Reviewed-by: Sandra Sun <[email protected]>
Commit-Queue: Sandra Sun <[email protected]>
Cr-Commit-Position: refs/heads/master@{#574931}
  • Loading branch information
sunyunjia authored and chromium-wpt-export-bot committed Jul 13, 2018
1 parent e5dee45 commit f4f52bf
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions css/css-scroll-snap/snap-at-user-scroll-end-manual.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ <h4>Tests that the window can snap at user scroll end.</h4>
</div>

<script>
var snap_test = async_test('Tests that window should snap at user scroll end.');
var body = document.body;
var button = document.getElementById("btn");
var target = document.getElementById("target");
Expand Down Expand Up @@ -81,7 +80,7 @@ <h4>Tests that the window can snap at user scroll end.</h4>
// To make the test result visible.
var content = document.getElementById("content");
body.removeChild(content);
snap_test.done();
done();
}

</script>
</script>

0 comments on commit f4f52bf

Please sign in to comment.