| Index: LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
|
| diff --git a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
|
| index 709b07b63ff15e42668aeb5137393aa5ba31545f..5c12c89ce9b66c6bb640441d8fa42c3fa715dbf1 100644
|
| --- a/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
|
| +++ b/LayoutTests/fast/events/platform-wheelevent-paging-xy-in-scrolling-page.html
|
| @@ -2,10 +2,23 @@
|
| <head>
|
| <script src="../../resources/js-test.js"></script>
|
| <script>
|
| + var isMacOSX = navigator.userAgent.indexOf("Mac OS X") >= 0;
|
| +
|
| var givenScrollTop = 2; // Only one page per event, so this should be interpreted as 1
|
| var givenScrollLeft = 2;
|
| - var expectedScrollTop = 511; // Window is 800x600. 15 pixel scrollbars. Scroll 87.5% of visible.
|
| - var expectedScrollLeft = 686;
|
| +
|
| + var maxOverlapBetweenPages = 40;
|
| +
|
| + // Window is 800x600. Page scrolls 87.5% of window size.
|
| + var expectedScrollTop = 600 * 0.875;
|
| + var expectedScrollLeft = 800 * 0.875;
|
| +
|
| + if (isMacOSX) {
|
| + // On Mac, there is a max overlap between pages that can affect the page scroll size.
|
| + expectedScrollTop = Math.max(expectedScrollTop, 600 - maxOverlapBetweenPages);
|
| + expectedScrollLeft = Math.max(expectedScrollLeft, 800 - maxOverlapBetweenPages);
|
| + }
|
| +
|
| var event;
|
| var div;
|
|
|
|
|
Chromium Code Reviews
Issue 1298973004:
Remove special wheel handling path from ScrollableArea (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master