third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html - Issue 2105473002: Rename visualViewport.pageScale to visualViewport.scale

Unified Diff: third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html

Issue 2105473002: Rename visualViewport.pageScale to visualViewport.scale (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix broken tests Created 4 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

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html

diff --git a/third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html b/third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html

index 9159b5a1a14ae54975ce74d23675860fbc4425fe..d58f3b193e5f165f915af36fbf33cc5fb1d83831 100644

--- a/third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html

+++ b/third_party/WebKit/LayoutTests/fast/dom/viewport/verify-viewport-dimensions.html

@@ -1,5 +1,4 @@

<!DOCTYPE html>

-<script src="../../../resources/js-test.js"></script>

<style>

body {

height: 2000px;

@@ -11,55 +10,51 @@

}

</style>

-<script>

- window.jsTestIsAsync = true;

- description("This test verifies the dimensions of the visual viewport \

- returned by the JS visual viewport API.");

- function runTest() {

- if (!window.eventSender || !window.internals) {

- finishJSTest();

- return;

- }

- // Turn off smooth scrolling.

- internals.settings.setScrollAnimatorEnabled(false);

- // Scroll both viewports.

- eventSender.mouseMoveTo(100, 100);

- eventSender.continuousMouseScrollBy(100, 100);

- debug(" **** Initial visual viewport dimensions *****");

- shouldBe("window.visualViewport.scrollTop", "0");

- shouldBe("window.visualViewport.scrollLeft", "0");

- shouldBe("window.visualViewport.clientWidth", "800");

- shouldBe("window.visualViewport.clientHeight", "600");

- shouldBe("window.visualViewport.pageScale", "1");

+<script src="../../../resources/testharness.js"></script>

+<script src="../../../resources/testharnessreport.js"></script>

- // Scale and scroll visual viewport.

- internals.setPageScaleFactor(2);

- internals.setVisualViewportOffset(10, 10);

- debug(" **** Viewport dimensions after scale and scroll *****");

- shouldBe("window.visualViewport.scrollTop", "10");

- shouldBe("window.visualViewport.scrollLeft", "10");

- shouldBe("window.visualViewport.clientWidth", "400");

- shouldBe("window.visualViewport.clientHeight", "300");

- shouldBe("window.visualViewport.pageScale", "2");

- window.visualViewport.scrollTop = 20;

- window.visualViewport.scrollLeft = 0;

- debug(" **** Writable viewport dimensions *****");

- shouldBe("window.visualViewport.scrollTop", "20");

- shouldBe("window.visualViewport.scrollLeft", "0");

- window.visualViewport.scrollTop = -20;

- shouldBe("window.visualViewport.scrollTop", "0");

- window.visualViewport.scrollTop = 20.5;

- shouldBe("window.visualViewport.scrollTop", "20.5");

- finishJSTest();

- }

+<script>

+ function viewport() {

+ return window.visualViewport;

+ }

+ async_test(function(t) {

+ window.onload = t.step_func(function() {

+ // Turn off smooth scrolling.

+ internals.settings.setScrollAnimatorEnabled(false);

+ // Scroll both viewports.

+ eventSender.mouseMoveTo(100, 100);

+ eventSender.continuousMouseScrollBy(100, 100);

+ // Initial viewport dimensions.

+ assert_equals(viewport().clientWidth, 800, "initial clientWidth");

+ assert_equals(viewport().clientHeight, 600, "initial clientHeight");

+ assert_equals(viewport().scrollLeft, 0, "initial scrollLeft");

+ assert_equals(viewport().scrollTop, 0, "initial scrollTop");

+ assert_equals(viewport().scale, 1, "initial scale");

+ // Scale and scroll visual viewport.

+ internals.setPageScaleFactor(2);

+ internals.setVisualViewportOffset(10, 10);

+ assert_equals(viewport().clientWidth, 400, "scaled width");

+ assert_equals(viewport().clientHeight, 300, "scaled height");

+ assert_equals(viewport().scrollLeft, 10, "scrolled left viewport");

+ assert_equals(viewport().scrollTop, 10, "scrolled top viewport");

+ assert_equals(viewport().scale, 2, "scale");

+ // Set scrollTop/Left.

+ window.visualViewport.scrollTop = 20;

+ window.visualViewport.scrollLeft = 0;

+ assert_equals(viewport().scrollTop, 20, "set scrollTop");

+ assert_equals(viewport().scrollLeft, 0, "set scrollLeft");

+ window.visualViewport.scrollTop = -20;

+ assert_equals(viewport().scrollTop, 0, "negative scrollTop");

+ window.visualViewport.scrollTop = 20.5;

+ assert_equals(viewport().scrollTop, 20.5, "floating point scrollTop");

+ t.done();

+ });

+ }, 'Verify viewport dimensions');

</script>

-<body onload="runTest()"></body>