| Index: third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-exclude-custom-scrollbars.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-exclude-custom-scrollbars.html b/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-exclude-custom-scrollbars.html
|
| index 50a592ca325e687c98efb0d7c53d01bb96f240c3..d875cde15682ca3764ff0f4336285b01c599c347 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-exclude-custom-scrollbars.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/dom/viewport/viewport-dimensions-exclude-custom-scrollbars.html
|
| @@ -23,8 +23,8 @@
|
| <script>
|
| var browserZoomFactor = 1.25;
|
| var pageScaleFactor = 2;
|
| - var scrollbarWidth = 20;
|
| - var scrollbarHeight = 20;
|
| + var scrollbarWidthCSSPixels = 20 / pageScaleFactor;
|
| + var scrollbaHeightCSSPixels = 20 / pageScaleFactor;
|
|
|
| function viewport() {
|
| return window.visualViewport;
|
| @@ -37,16 +37,16 @@
|
| internals.setPageScaleFactor(pageScaleFactor);
|
|
|
| // Verify viewport dimensions exclude scrollbar.
|
| - assert_equals(viewport().clientWidth, 800 / pageScaleFactor - scrollbarWidth);
|
| - assert_equals(viewport().clientHeight, 600 / pageScaleFactor - scrollbarHeight);
|
| + assert_equals(viewport().clientWidth, 800 / pageScaleFactor - scrollbarWidthCSSPixels);
|
| + assert_equals(viewport().clientHeight, 600 / pageScaleFactor - scrollbaHeightCSSPixels);
|
|
|
| // Apply browser zoom.
|
| window.internals.setZoomFactor(browserZoomFactor);
|
|
|
| // Verify scrollbar exclusion with browser zoom. Custom scrollbars are
|
| // scaled with browser zoom but remain unchanged with pinch zoom.
|
| - assert_equals(viewport().clientWidth, 800 / browserZoomFactor / pageScaleFactor - scrollbarWidth * browserZoomFactor);
|
| - assert_equals(viewport().clientHeight, 600 / browserZoomFactor / pageScaleFactor - scrollbarHeight * browserZoomFactor);
|
| + assert_equals(viewport().clientWidth, 800 / browserZoomFactor / pageScaleFactor - scrollbarWidthCSSPixels * browserZoomFactor);
|
| + assert_equals(viewport().clientHeight, 600 / browserZoomFactor / pageScaleFactor - scrollbaHeightCSSPixels * browserZoomFactor);
|
| t.done();
|
| });
|
| }, 'Verify viewport dimensions exclude custom scrollbars.');
|
|
|