third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html - Issue 2165763002: Fix layout tests that would fail if ScrollAnchoring was promoted to experimental

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html

Issue 2165763002: Fix layout tests that would fail if ScrollAnchoring was promoted to experimental (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address review comments Created 4 years, 5 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/editing/execCommand/insert-line-break-no-scroll.html ('k') | third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html

index 58648f03b73af9b20c449235d50fd4f3e1c2a8ea..ec9dd18bd01e40292d7c25091fc2586d8183f3cd 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls.html

@@ -1,7 +1,8 @@

<!DOCTYPE HTML>

<head>

<title>Canvas test: drawFocusIfNeeded scrolls</title>

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

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

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

</head>

<div style="border: 1px solid #000; height: 1000px;">1000-pixel box</div>

@@ -10,8 +11,6 @@

</canvas>

-if (window.testRunner)

- testRunner.dumpAsText();

var canvas = document.getElementById("canvas");

var context = canvas.getContext("2d");

@@ -33,25 +32,27 @@ function draw() {

context.drawFocusIfNeeded(document.getElementById("bottom_button"));

}

-document.getElementById("bottom_button").focus();

-window.scrollTo(0, 0);

-shouldBe("window.pageYOffset", "0");

-draw();

-var minYOffset = BOTTOM_BUTTON_Y_POS + canvas.offsetTop - window.innerHeight;

-var maxYOffset = BOTTOM_BUTTON_Y_POS + canvas.offsetTop;

-shouldBeGreaterThanOrEqual("window.pageYOffset", "minYOffset");

-shouldBeGreaterThanOrEqual("maxYOffset", "window.pageYOffset");

-document.getElementById("top_button").focus();

-shouldBeGreaterThanOrEqual("window.pageYOffset", "minYOffset");

-shouldBeGreaterThanOrEqual("maxYOffset", "window.pageYOffset");

-draw();

-minYOffset = TOP_BUTTON_Y_POS + canvas.offsetTop - window.innerHeight;

-maxYOffset = TOP_BUTTON_Y_POS + canvas.offsetTop;

-shouldBeGreaterThanOrEqual("window.pageYOffset", "minYOffset");

-shouldBeGreaterThanOrEqual("maxYOffset", "window.pageYOffset");

+test(function(t) {

+ document.getElementById("bottom_button").focus();

+ window.scrollTo(0, 0);

+ assert_equals(window.pageYOffset, 0);

+ draw();

+ var minYOffset = BOTTOM_BUTTON_Y_POS + canvas.offsetTop - window.innerHeight;

+ var maxYOffset = BOTTOM_BUTTON_Y_POS + canvas.offsetTop;

+ assert_greater_than_equal(window.pageYOffset, minYOffset);

+ assert_greater_than_equal(maxYOffset, window.pageYOffset);

+ document.getElementById("top_button").focus();

+ assert_greater_than_equal(window.pageYOffset, minYOffset);

+ assert_greater_than_equal(maxYOffset, window.pageYOffset);

+ draw();

+ minYOffset = TOP_BUTTON_Y_POS + canvas.offsetTop - window.innerHeight;

+ maxYOffset = TOP_BUTTON_Y_POS + canvas.offsetTop;

+ assert_greater_than_equal(window.pageYOffset, minYOffset);

+ assert_greater_than_equal(maxYOffset, window.pageYOffset);

+}, 'Canvas test: drawFocusIfNeeded scrolls');

</script>

</body>