Unify template to create canvas and offscreencanvas tests

The typical way to add tests for canvas and offscreencanvas is as
following:
- write the test in yaml/element (create the test for canvas)
- copy the the test to yaml/offscreencanvas
- add t.done() to the end of test (create the test for offscreencanvas)

This is because the API for canvas and offscreencanvas are mostly the
same.

This cl updates templates and gentestutils to allow the framework of
generate canvas and offscreencanvas test from test.

I removed both yaml/element/color_space.yaml and
yaml/offscreencanvas/color_space.yaml and add yaml_new/color_space.yaml.
Now the yaml_new/color_space.yaml generates the same results as before.

Note that it's possible to add test for a particular canvas type
by using canvasType as keyword.

Bug: 1275750
Change-Id: I6bf48ec3081f5fe3669bf585f92b39a712045c6b

html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.p3.html

@@ -20,9 +20,9 @@ <h1>2d.color.space.p3.to.p3</h1>
 _addTest(function(canvas, ctx) {
 
 var color_style = 'rgb(50, 100, 150)';
-var epsilon = 2;
 // [0.24304, 0.38818, 0.57227, 1.0] * 255 = [62, 99, 146, 255]
 var pixel_expected = [62, 99, 146, 255];
+var epsilon = 2;
 ctx.fillStyle = color_style;
 ctx.fillRect(0, 0, 10, 10);
 

html/canvas/element/wide-gamut-canvas/2d.color.space.p3.to.srgb.html

@@ -20,8 +20,8 @@ <h1>2d.color.space.p3.to.srgb</h1>
 _addTest(function(canvas, ctx) {
 
 var color_style = 'rgb(50, 100, 150)';
-var epsilon = 2;
 var pixel_expected = [50, 100, 150, 255];
+var epsilon = 2;
 ctx.fillStyle = color_style;
 ctx.fillRect(0, 0, 10, 10);
 

html/canvas/tools/gentest.py

@@ -1,4 +1,6 @@
 from gentestutils import genTestUtils
+from gentestutilsunion import genTestUtils_union
 
-genTestUtils('../element', '../element', 'templates.yaml', 'name2dir.yaml', False)
-genTestUtils('../offscreen', '../offscreen', 'templates-offscreen.yaml', 'name2dir-offscreen.yaml', True)
+genTestUtils('../element', '../element', 'templates.yaml', 'name2dir-canvas.yaml', False)
+genTestUtils('../offscreen', '../offscreen', 'templates.yaml', 'name2dir-offscreen.yaml', True)
+genTestUtils_union('templates-new.yaml', 'name2dir-canvas.yaml')

html/canvas/tools/gentest_union.py

@@ -0,0 +1,3 @@
+from gentestutilsunion import genTestUtils_union
+
+genTestUtils_union('templates-new.yaml', 'name2dir-canvas.yaml')

html/canvas/tools/gentestutils.py

@@ -404,13 +404,15 @@ def expand_test_code(code):
                 'fallback':fallback, 'attributes':attributes,
                 'context_args': context_args
             }
-
-            f = codecs.open('%s/%s%s.html' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
-            f.write(templates['w3c'] % template_params)
             if ISOFFSCREENCANVAS:
+                f = codecs.open('%s/%s%s.html' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
+                f.write(templates['w3coffscreencanvas'] % template_params)
                 timeout = '// META: timeout=%s\n' % test['timeout'] if 'timeout' in test else ''
                 template_params['timeout'] = timeout
                 f = codecs.open('%s/%s%s.worker.js' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
                 f.write(templates['w3cworker'] % template_params)
+            else:
+                f = codecs.open('%s/%s%s.html' % (TESTOUTPUTDIR, mapped_name, name_variant), 'w', 'utf-8')
+                f.write(templates['w3ccanvas'] % template_params)
 
     print()