third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html - Issue 2700823002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

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

Issue 2700823002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)

Patch Set: Addressing comments Created 3 years, 10 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

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz-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-horiz.html

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

index 46a66d9702b9ee2b48972bfbb217b6fec97fa9bc..3e8ffe05cd69c9174eebd3fd3a2cef5c6c36b7ce 100644

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

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

@@ -1,9 +1,6 @@

-<!DOCTYPE HTML>

-<head>

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

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

-</head>

-<body style="padding: 0; margin: 0">

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

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

1000-pixel box

@@ -13,49 +10,50 @@

</canvas>

</div>

-<script>

-if (window.testRunner)

- testRunner.dumpAsText();

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

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

-var LEFT_BUTTON_X_POS = 50;

-var RIGHT_BUTTON_X_POS = 4750;

-function draw() {

- context.beginPath();

- context.rect(LEFT_BUTTON_X_POS, 50, 200, 100);

- context.fillStyle = "#ccf";

- context.fill();

- context.drawFocusIfNeeded(document.getElementById("left_button"));

- context.beginPath();

- context.rect(RIGHT_BUTTON_X_POS, 50, 200, 100);

- context.fillStyle = "#fcc";

- context.fill();

- context.drawFocusIfNeeded(document.getElementById("right_button"));

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

-window.scrollTo(0, 0);

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

-draw();

-var minXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth;

-var maxXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft;

-shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset");

-shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset");

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

-shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset");

-shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset");

-draw();

-minXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth;

-maxXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft;

-shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset");

-shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset");

+<script>

+test(function(t) {

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

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

+ var LEFT_BUTTON_X_POS = 50;

+ var RIGHT_BUTTON_X_POS = 4750;

+ function draw() {

+ context.beginPath();

+ context.rect(LEFT_BUTTON_X_POS, 50, 200, 100);

+ context.fillStyle = "#ccf";

+ context.fill();

+ context.drawFocusIfNeeded(document.getElementById("left_button"));

+ context.beginPath();

+ context.rect(RIGHT_BUTTON_X_POS, 50, 200, 100);

+ context.fillStyle = "#fcc";

+ context.fill();

+ context.drawFocusIfNeeded(document.getElementById("right_button"));

+ }

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

+ window.scrollTo(0, 0);

+ assert_true(window.pageXOffset == 0);

+ draw();

+ var minXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth;

+ var maxXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft;

+ assert_true(window.pageXOffset >= minXOffset);

+ assert_true(maxXOffset >= window.pageXOffset);

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

+ assert_true(window.pageXOffset >= minXOffset);

+ assert_true(maxXOffset >= window.pageXOffset);

+ draw();

+ minXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth;

+ maxXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft;

+ assert_true(window.pageXOffset >= minXOffset);

+ assert_true(maxXOffset >= window.pageXOffset);

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

</script>

</body>