third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html - Issue 2246303003: Use testharness.js instead of js-test.js in fast/images.

Unified Diff: third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html

Issue 2246303003: Use testharness.js instead of js-test.js in fast/images. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Modify test as per the comments. Created 4 years, 4 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/images/image-document-remove-listener-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html

diff --git a/third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html b/third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html

index 537c6efb91af141365a9f862fb066e32ecbe004f..5f07093c1a6515e95aa470393dccaadf4227b335 100644

--- a/third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html

+++ b/third_party/WebKit/LayoutTests/fast/images/onload-event-when-reloading-image-after-interrupted-broken-image-load.html

@@ -1,39 +1,21 @@

<!DOCTYPE html>

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

+<title>crbug.com/469678: We should fire an image load event even if the image is the last one we loaded successfully.</title>

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

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

- if (window.testRunner) {

- testRunner.waitUntilDone();

- testRunner.dumpAsText();

- }

- img = new Image();

- var onloadCounter = 0;

+async_test(function(t) {

+ var img = new Image();

var testImage = 'resources/green.jpg';

var resetImage = 'resources/bad-png.png';

- img.onload = function(){

- onloadCounter++;

- debug("Image onload event fired for " + img.src.substring(img.src.lastIndexOf('/') + 1));

- if (onloadCounter == 2) {

- document.getElementById('result').textContent = "PASS";

- if (window.testRunner)

- testRunner.notifyDone();

- return;

- }

- if (onloadCounter == 1) {

- setTimeout(function() {

- img.src= resetImage;

- img.src = testImage;

- }, 0);

- return;

- }

- document.getElementById('result').textContent = "FAIL";

- };

- setTimeout(function() {

- img.src= resetImage;

+ // Load an image.

+ img.src = resetImage;

+ img.src = testImage;

+ // Make a request for a broken image which doesn't get the chance to

+ // complete before we attempt to load the same image again.

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

+ img.src = resetImage;

img.src = testImage;

- }, 0);

+ img.onload = t.step_func_done();

+ });

+});

</script>

-<div id="console">

-crbug.com/469678: We should fire an image load event even if the image is the last one we loaded successfully.<br>

-In this test we load an image. Then we make a request for a broken image which doesn't get the chance to complete before we attempt to load the same image again.<br>

-</div>

-<div id="result">FAIL</div>