third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html - Issue 2948663002: [Reland] Re-target wheel events only on new scroll sequence.

Unified Diff: third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html

Issue 2948663002: [Reland] Re-target wheel events only on new scroll sequence. (Closed)

Patch Set: Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« content/browser/renderer_host/input/wheel_scroll_latching_browsertest.cc ('K') | « third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-basic.html ('k') | third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-in-scrolling-div.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html

diff --git a/third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html b/third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html

index 94f1428ac42c8d695a2c2d3d648c17c52334c029..581c776bca03e0821cd58b872fb657e5083de2fd 100644

--- a/third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html

+++ b/third_party/WebKit/LayoutTests/fast/events/wheel/wheelevent-ctrl.html

@@ -23,7 +23,7 @@ function runTest() {

debug('With ctrl modifier set and canScroll set to be false');

wheelEventCount = 0;

eventSender.mouseMoveTo(testDiv.offsetLeft + 5, testDiv.offsetTop + 5);

- eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", false);

+ eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", false , "phaseBegan");

shouldBe("wheelEventCount", "1");

shouldEvaluateTo("deltaY", expectedDeltaY);

shouldBeTrue("ctrlKey");

@@ -32,7 +32,7 @@ function runTest() {

debug('Without ctrl and canScroll set to be default true');

wheelEventCount = 0;

eventSender.mouseMoveTo(testDiv.offsetLeft + 5, testDiv.offsetTop + 5);

- eventSender.mouseScrollBy(0, scrollAmount, false, true);

+ eventSender.mouseScrollBy(0, scrollAmount, false, true, 0, true, "phaseChanged");

shouldBe("wheelEventCount", "1");

shouldEvaluateTo("deltaY", expectedDeltaY);

shouldBeFalse("ctrlKey");

@@ -45,7 +45,7 @@ function runTest() {

debug('With ctrl modifier set and canScroll set to be false');

wheelEventCount = 0;

eventSender.mouseMoveTo(testDiv.offsetLeft + 5, testDiv.offsetTop + 5);

- eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", false);

+ eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", false, "phaseChanged");

shouldBe("wheelEventCount", "1");

shouldEvaluateTo("deltaY", expectedDeltaY);

shouldBeTrue("ctrlKey");

@@ -54,7 +54,7 @@ function runTest() {

debug('With ctrl modifier set and canScroll set to be true');

wheelEventCount = 0;

eventSender.mouseMoveTo(testDiv.offsetLeft + 5, testDiv.offsetTop + 5);

- eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", true);

+ eventSender.mouseScrollBy(0, scrollAmount, false, true, "ctrlKey", true, "phaseChanged");

shouldBe("wheelEventCount", "1");

shouldEvaluateTo("deltaY", expectedDeltaY);

shouldBeTrue("ctrlKey");

@@ -63,7 +63,7 @@ function runTest() {

debug('Now without ctrl and canScroll set to be default true');

wheelEventCount = 0;

eventSender.mouseMoveTo(testDiv.offsetLeft + 5, testDiv.offsetTop + 5);

- eventSender.mouseScrollBy(0, scrollAmount, false, true);

+ eventSender.mouseScrollBy(0, scrollAmount, false, true, 0, true, "phaseChanged");

shouldBe("wheelEventCount", "1");

shouldEvaluateTo("deltaY", expectedDeltaY);

shouldBeFalse("ctrlKey");