From 2348fec4af02cb45cfe42a69597e3a52dd76f1af Mon Sep 17 00:00:00 2001
From: Taiju Tsuiki <tzik@chromium.org>
Date: Mon, 23 Jul 2018 10:39:30 +0000
Subject: [PATCH] Bug 1475532 [wpt PR 11961] - Revert "Correctly initialize and
 test SnapContainerData in cc.", a=testonly

Automatic update from web-platform-testsRevert "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}

--

wpt-commits: 211d3165a3b66b6a8eb85a765b0aedb60410ab88
wpt-pr: 11961
---
 testing/web-platform/meta/MANIFEST.json                      | 2 +-
 .../css/css-scroll-snap/snap-at-user-scroll-end-manual.html  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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