Use testharness.js instead of js-test.js in fast/images.

third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html

Index: third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html
diff --git a/third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html b/third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html
index ed96a5d72095a27a2f606a634be6d69fcceb5c29..c079d1b7bae1e9bcd6391cbb1f6f6ad60886862a 100644
--- a/third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html
+++ b/third_party/WebKit/LayoutTests/fast/images/webgl-teximage2d.html
@@ -1,36 +1,29 @@
-<script src="../../resources/js-test.js"></script>
+<script src="../../resources/testharness.js"></script>

[fs, 2016/08/17 11:41:33]

Add doctype.

[sivag, 2016/08/17 13:31:21]

Done.

+<script src="../../resources/testharnessreport.js"></script>
 <script src="../canvas/webgl/resources/webgl-test.js"></script>
-<canvas id="canvas" width="0" height="0"> </canvas>
-<img src="resources/green.jpg" width="0" height="0" id="image"></img>
+<canvas width="0" height="0"> </canvas>
+<img src="resources/green.jpg" width="0" height="0"></img>
 <script>
-jsTestIsAsync = true;
-
-var gl = create3DContext(document.getElementById("canvas"));
-if (!gl) {
-    testFailed("context does not exist");
-} else {
-    testPassed("context exists");
-}
-
-var enums = new Array();
-for (var name in gl) {
-    if (typeof gl[name] == 'number')
-        enums[gl[name]] = name;
-}
-
-var img = document.getElementById("image");
-img.onload = function() {
-    var texture = gl.createTexture();
-    gl.bindTexture(gl.TEXTURE_2D, texture);
-    try {
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, img);
-        var err = gl.getError();
-        if (err != gl.NO_ERROR)
-            throw "WebGL error: " + enums[err];
-        testPassed("OK");
-    } catch (e) {
-        testFailed(e.toString());
+async_test(function(t) {
+    var gl = create3DContext(document.querySelector("canvas"));
+    assert_equals(false, !gl);

[fs, 2016/08/17 11:41:33]

Accessing 'gl' below if it's null will throw and fail the test - hopefully
that's enough? If you want to keep this, then maybe use assert_false instead (or
add one more ! and use assert_true.)

[sivag, 2016/08/17 13:31:21]

Done.

+    var enums = new Array();
+    for (var name in gl) {
+        if (typeof gl[name] == 'number')
+            enums[gl[name]] = name;
     }
-    finishJSTest();
-}
+    var img = document.querySelector("img");
+    img.onload = t.step_func_done(function() {
+        var texture = gl.createTexture();
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        try {

[fs, 2016/08/17 11:41:33]

This shouldn't be needed (uncaught exceptions will fail the test), so this
should be possible to simplify to something like:

gl.bindTexture(...);
gl.texImage2D(...);
assert_equals(gl.getError(), gl.NO_ERROR);

(That would make 'enums' unused too I think.)

[sivag, 2016/08/17 13:31:21]

Done.

+            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, img);
+            var err = gl.getError();
+            if (err != gl.NO_ERROR)
+                throw "WebGL error: " + enums[err];
+        } catch (e) {
+           assert_false(e.length != 0);
+        }
+    });
+});
 </script>