Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-value.html |
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-value.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-value.html |
index f3719e4f3e216cf8c0a19239921926cd5923d9af..34d0013d5abe9053e4169c794a72bc784f5826ed 100644 |
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-value.html |
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-filter-value.html |
@@ -1,39 +1,40 @@ |
-<script src="../../resources/js-test.js"></script> |
+<script src="../../resources/testharness.js"></script> |
+<script src="../../resources/testharnessreport.js"></script> |
<script> |
- |
-var canvas = document.createElement('canvas'); |
-var ctx = canvas.getContext('2d'); |
- |
-shouldBe('ctx.filter', '"none"'); |
-ctx.filter = 'blur(5px)'; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
- |
-ctx.save(); |
-ctx.filter = 'none'; |
-shouldBe('ctx.filter', '"none"'); |
-ctx.restore(); |
-shouldBe('ctx.filter', '"blur(5px)"'); |
- |
-// Invalid filter should be ignored |
-ctx.filter = 'blur(10)'; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
-ctx.filter = 'blur 10px'; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
- |
-ctx.filter = 'inherit'; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
-ctx.filter = 'initial'; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
- |
-ctx.filter = ''; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
-ctx.filter = null; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
-ctx.filter = undefined; |
-shouldBe('ctx.filter', '"blur(5px)"'); |
- |
-// verify that exact string is preserved |
-ctx.filter = 'blur( 5px)'; |
-shouldBe('ctx.filter', '"blur( 5px)"'); |
- |
+test(function(t) { |
+ var canvas = document.createElement('canvas'); |
+ var ctx = canvas.getContext('2d'); |
+ |
+ assert_equals(ctx.filter, 'none'); |
+ ctx.filter = 'blur(5px)'; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ |
+ ctx.save(); |
+ ctx.filter = 'none'; |
+ assert_equals(ctx.filter, 'none'); |
+ ctx.restore(); |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ |
+ // Invalid filter should be ignored |
+ ctx.filter = 'blur(10)'; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ ctx.filter = 'blur 10px'; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ |
+ ctx.filter = 'inherit'; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ ctx.filter = 'initial'; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ |
+ ctx.filter = ''; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ ctx.filter = null; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ ctx.filter = undefined; |
+ assert_equals(ctx.filter, 'blur(5px)'); |
+ |
+ // verify that exact string is preserved |
+ ctx.filter = 'blur( 5px)'; |
+ assert_equals(ctx.filter, 'blur( 5px)'); |
+}, 'Test that createImageBitmap from a bitmaprenderer canvas produces correct result'); |
</script> |