From f7e77e6afe8f563228df0e1f956ae16ca1b4c8a7 Mon Sep 17 00:00:00 2001
From: Sandra Sun <sunyunjia@chromium.org>
Date: Wed, 25 Jul 2018 15:39:18 +0000
Subject: [PATCH] Bug 1475729 [wpt PR 11969] - Reland "Correctly initialize and
 test SnapContainerData in cc.", a=testonly

Automatic update from web-platform-testsReland "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 <sunyunjia@chromium.org>
> > Reviewed-by: Majid Valipour <majidvp@chromium.org>
> > Reviewed-by: Robert Flack <flackr@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#574781}
>
> TBR=flackr@chromium.org,majidvp@chromium.org,sunyunjia@chromium.org
>
> 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 <tzik@chromium.org>
> Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#574825}

TBR=flackr@chromium.org,majidvp@chromium.org,sunyunjia@chromium.org,tzik@chromium.org

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 <sunyunjia@chromium.org>
Commit-Queue: Sandra Sun <sunyunjia@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574926}

--

wpt-commits: 7b9c0db081fc56c7d3b1ab5cd729172a04ace21c
wpt-pr: 11969
MozReview-Commit-ID: IcOob62I6xz
---
 testing/web-platform/meta/MANIFEST.json                      | 2 +-
 .../css/css-scroll-snap/snap-at-user-scroll-end-manual.html  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 0b37f0d5ad5f..1b69db1fef1f 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -528394,7 +528394,7 @@
    "testharness"
   ],
   "css/css-scroll-snap/snap-at-user-scroll-end-manual.html": [
-   "51f08f58135901b332ff43d15fbdc8d0a22f962c",
+   "4ab47c6043d258fa613325f767f5ec8004031a9e",
    "manual"
   ],
   "css/css-scroll-snap/snap-inline-block.html": [
diff --git a/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html b/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html
index d1e4be5a20a2..0ab50d6be3e5 100644
--- a/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html
+++ b/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html
@@ -45,6 +45,7 @@ body {
 </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");
@@ -80,7 +81,7 @@ button.onclick = function() {
   // To make the test result visible.
   var content = document.getElementById("content");
   body.removeChild(content);
-  done();
+  snap_test.done();
 }
 
-</script>
\ No newline at end of file
+</script>