Add ColorspaceConversion in ImageBitmapOptions

third_party/WebKit/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-image-bitmap-utils.js

 function checkCanvasRect(buf, x, y, width, height, color, tolerance, bufWidth, retVal)
 {
     for (var px = x; px < x + width; px++) {
         for (var py = y; py < y + height; py++) {
             var offset = (py * bufWidth + px) * 4;
             for (var j = 0; j < color.length; j++) {
                 if (Math.abs(buf[offset + j] - color[j]) > tolerance) {
                     retVal.testPassed = false;
                     return;
                 }
             }
         }
     }
 }
 
-function runOneIteration(useTexSubImage2D, bindingTarget, program, bitmap, flipY, premultiplyAlpha, retVal)
+function runOneIteration(useTexSubImage2D, bindingTarget, program, bitmap, flipY, premultiplyAlpha, retVal, colorspace = 'empty')
 {
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
     // Enable writes to the RGBA channels
     gl.colorMask(1, 1, 1, 0);
     var texture = gl.createTexture();
     // Bind the texture to texture unit 0
     gl.bindTexture(bindingTarget, texture);
     // Set up texture parameters
     gl.texParameteri(bindingTarget, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
     gl.texParameteri(bindingTarget, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
@@ skipping 27 matching lines @@
     var quaterHeight = Math.floor(halfHeight / 2);
 
     var top = flipY ? quaterHeight : (height - halfHeight + quaterHeight);
     var bottom = flipY ? (height - halfHeight + quaterHeight) : quaterHeight;
 
     var tl = redColor;
     var tr = premultiplyAlpha ? ((retVal.alpha == 0.5) ? halfRed : (retVal.alpha == 1) ? redColor : blackColor) : redColor;
     var bl = greenColor;
     var br = premultiplyAlpha ? ((retVal.alpha == 0.5) ? halfGreen : (retVal.alpha == 1) ? greenColor : blackColor) : greenColor;
 
+    var blueColor = [0, 0, 255];
+    if (colorspace == 'none') {
+        tl = tr = bl = br = blueColor;
+    } else if (colorspace == 'default') {
+        tl = tr = bl = br = redColor;
+    }
+
     var loc;
     if (bindingTarget == gl.TEXTURE_CUBE_MAP) {
         loc = gl.getUniformLocation(program, "face");
     }
 
     var tolerance = (retVal.alpha == 0) ? 0 : 3;
+    if (colorspace == 'default' || colorspace == 'none')
+        tolerance = 8;
     for (var tt = 0; tt < targets.length; ++tt) {
         if (bindingTarget == gl.TEXTURE_CUBE_MAP) {
             gl.uniform1i(loc, targets[tt]);
         }
         // Draw the triangles
         gl.clearColor(0, 0, 0, 1);
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         gl.drawArrays(gl.TRIANGLES, 0, 6);
 
         // Check the top pixel and bottom pixel and make sure they have
         // the right color.
         var buf = new Uint8Array(width * height * 4);
         gl.readPixels(0, 0, width, height, gl.RGBA, gl.UNSIGNED_BYTE, buf);
         checkCanvasRect(buf, quaterWidth, bottom, 2, 2, tl, tolerance, width, retVal);
         checkCanvasRect(buf, halfWidth + quaterWidth, bottom, 2, 2, tr, tolerance, width, retVal);
         checkCanvasRect(buf, quaterWidth, top, 2, 2, bl, tolerance, width, retVal);
         checkCanvasRect(buf, halfWidth + quaterWidth, top, 2, 2, br, tolerance, width, retVal);
     }
 }
 
 function runTestOnBindingTarget(bindingTarget, program, bitmaps, retVal) {
     var cases = [
         { sub: false },
         { sub: true },

[Justin Novosad, 2016/03/09 16:29:39]

The structure of this test is getting messy as it grows. This test would be a
lot clearer if we just used 'cases' for the expansion.

[xidachen, 2016/03/14 13:29:41]

This is now cleaned up, everything is put in cases.

     ];
 
     for (var i in cases) {
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.defaultOption, false, true, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.noFlipYPremul, false, true, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.noFlipYDefault, false, true, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.noFlipYUnpremul, false, false, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.flipYPremul, true, true, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.flipYDefault, true, true, retVal);
         runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.flipYUnpremul, true, false, retVal);
+        if (retVal.colorspaceEffect) {
+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceDef, false, true, retVal, 'default');
+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceNone, false, true, retVal, 'none');
+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceDefault, false, true, retVal, 'default');

[Justin Novosad, 2016/03/09 16:29:39]

What is the difference between colorspaceDef and colorspaceDefault?

[xidachen, 2016/03/14 13:29:41]

colorspaceDef is created with out given any colorspace options.
colorspaceDefault is created with { colorspaceConversion: 'default' }. The
created ImageBitmap should be the same when using chromium, and this is the
testing to make sure that they are the same.

+        } else {
+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceDef, false, true, retVal);

[Justin Novosad, 2016/03/09 16:29:39]

How is this different from the line with bitmaps.defaultOption above?

[xidachen, 2016/03/14 13:29:41]

bitmaps.colorspaceDef is created with a png that has color-spin profile.
bitmaps.defaultOption is created with another png that is 2*2 with red on top
and green on bottom.

+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceNone, false, true, retVal);
+            runOneIteration(cases[i].sub, bindingTarget, program, bitmaps.colorspaceDefault, false, true, retVal);
+        }
     }
 }
 
-function runTest(bitmaps, alphaVal)
+function runTest(bitmaps, alphaVal, colorspaceEffective)
 {
-    var retVal = {testPassed: true, alpha: alphaVal};
+    var retVal = {testPassed: true, alpha: alphaVal, colorspaceEffect: colorspaceEffective};
     var program = tiu.setupTexturedQuad(gl, internalFormat);
     runTestOnBindingTarget(gl.TEXTURE_2D, program, bitmaps, retVal);
-//    program = tiu.setupTexturedQuadWithCubeMap(gl, internalFormat);
-//    runTestOnBindingTarget(gl.TEXTURE_CUBE_MAP, program, bitmaps, retVal);
+    program = tiu.setupTexturedQuadWithCubeMap(gl, internalFormat);
+    runTestOnBindingTarget(gl.TEXTURE_CUBE_MAP, program, bitmaps, retVal);
     return retVal.testPassed;
 }