Index: third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-transferControlToOffscreen.html |
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-transferControlToOffscreen.html b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-transferControlToOffscreen.html |
index a093f1e871a9866a67e6cc49315c85d3fdce81ab..1f168cd124324c8a82ff27d9f6db821eb8bc86dc 100644 |
--- a/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-transferControlToOffscreen.html |
+++ b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-transferControlToOffscreen.html |
@@ -1,11 +1,14 @@ |
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
<html> |
<head> |
-<script src="../../resources/testharness.js"></script> |
-<script src="../../resources/testharnessreport.js"></script> |
+<script src="../../resources/js-test.js"></script> |
</head> |
<body> |
<script> |
+ |
+description("Test transferControlToOffscreen."); |
+window.jsTestIsAsync = true; |
+ |
function createCanvas(width, height) { |
var canvas = document.createElement("canvas"); |
canvas.width = width; |
@@ -13,41 +16,32 @@ |
return canvas; |
} |
-test(function() { |
- var width = 50; |
- var height = 50; |
- var canvas1 = createCanvas(width, height); |
- var offscreenCanvas1; |
- try { |
- offscreenCanvas1 = canvas1.transferControlToOffscreen(); |
- assert_equals(offscreenCanvas1.width, width); |
- assert_equals(offscreenCanvas1.height, height); |
- } catch (ex) { |
- assert_false(ex.message); |
- } |
-}, "Tests whether transferControlToOffscreen can be run correctly."); |
+// Tests whether transferControlToOffscreen can be run correctly. |
+var width = 50; |
+var height = 50; |
+var canvas1 = createCanvas(width, height); |
+var offscreenCanvas1; |
+try { |
+ offscreenCanvas1 = canvas1.transferControlToOffscreen(); |
+ testPassed("Successfully created layer for offscreencanvas"); |
+ shouldBe("offscreenCanvas1.width", "width"); |
+ shouldBe("offscreenCanvas1.height", "height"); |
+} catch (ex) { |
+ testFailed(ex.message); |
+} |
-test(function() { |
- var canvas2 = createCanvas(50, 50); |
- var offscreenCanvas2; |
- var ctx = canvas2.getContext("2d"); |
- assert_throws("InvalidStateError", function() { |
- offscreenCanvas2 = canvas2.transferControlToOffscreen(); |
- assert_false("transferControlToOffscreen from a canvas with context didn't throw an exception."); |
- }, "transferControlToOffscreen from a canvas with context throws an exception"); |
-}, "Tests whether transferControlToOffscreen throws exception correctly."); |
+// Tests whether transferControlToOffscreen throws exception correctly. |
+var canvas2 = createCanvas(50, 50); |
+var offscreenCanvas2; |
+var ctx = canvas2.getContext("2d"); |
+try { |
+ offscreenCanvas2 = canvas2.transferControlToOffscreen(); |
+ testFailed("transferControlToOffscreen from a canvas with context didn't throw an exception."); |
+} catch (ex) { |
+ testPassed("transferControlToOffscreen from a canvas with context throws an exception: " + ex); |
+} |
-test(function() { |
- var canvas3 = createCanvas(10, 10); |
- var offscreenCanvas3 = canvas3.transferControlToOffscreen(); |
- assert_equals(offscreenCanvas3.width, 10); |
- assert_equals(offscreenCanvas3.height, 10); |
- offscreenCanvas3.width = 20; |
- offscreenCanvas3.height = 20; |
- assert_equals(offscreenCanvas3.width, 10); |
- assert_equals(offscreenCanvas3.height, 10); |
-}, "Test if resizing on offscreencanvas transferred from html canvas has no effect"); |
- |
+finishJSTest(); |
</script> |
</body> |
</html> |