| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <script src="./resources/webgl-test-utils-full.js"></script> | 4 <script src="./resources/webgl-test-utils-full.js"></script> |
| 5 <script src="./resources/tex-image-and-sub-image-utils.js"></script> | 5 <script src="./resources/tex-image-and-sub-image-utils.js"></script> |
| 6 <script src="./resources/tex-image-and-sub-image-image-bitmap-utils.js"></script
> | 6 <script src="./resources/tex-image-and-sub-image-image-bitmap-utils.js"></script
> |
| 7 <script src="../../../resources/js-test.js"></script> | 7 <script src="../../../resources/js-test.js"></script> |
| 8 <script> | 8 <script> |
| 9 | 9 |
| 10 window.jsTestIsAsync = true; | 10 window.jsTestIsAsync = true; |
| 11 | 11 |
| 12 var wtu = WebGLTestUtils; | 12 var wtu = WebGLTestUtils; |
| 13 var tiu = TexImageUtils; | 13 var tiu = TexImageUtils; |
| 14 var gl = null; | 14 var gl = null; |
| 15 var internalFormat = "RGBA"; | 15 var internalFormat = "RGBA"; |
| 16 var pixelFormat = "RGBA"; | 16 var pixelFormat = "RGBA"; |
| 17 var pixelType = "UNSIGNED_BYTE"; | 17 var pixelType = "UNSIGNED_BYTE"; |
| 18 var redColor = [255, 0, 0]; | 18 var redColor = [255, 0, 0]; |
| 19 var greenColor = [0, 255, 0]; | 19 var greenColor = [0, 255, 0]; |
| 20 var blackColor = [0, 0, 0]; | 20 var blackColor = [0, 0, 0]; |
| 21 var darkRed = [26, 0, 0]; | 21 var darkRed = [26, 0, 0]; |
| 22 var darkGreen = [0, 26, 0]; | 22 var darkGreen = [0, 26, 0]; |
| 23 | 23 |
| 24 var image = new Image(); | 24 var image1 = new Image(); |
| 25 var image2 = new Image(); |
| 25 | 26 |
| 26 function promiseRejected() | 27 function promiseRejected() |
| 27 { | 28 { |
| 28 document.getElementById("results").innerHTML = "Promise <span style='color:r
ed'>REJECTED</span>"; | 29 document.getElementById("results").innerHTML = "Promise <span style='color:r
ed'>REJECTED</span>"; |
| 29 } | 30 } |
| 30 | 31 |
| 31 function pass() | 32 function pass() |
| 32 { | 33 { |
| 33 document.getElementById("results").innerHTML = "Test <span style='color:gree
n'>PASSED</span>"; | 34 document.getElementById("results").innerHTML = "Test <span style='color:gree
n'>PASSED</span>"; |
| 34 } | 35 } |
| 35 | 36 |
| 36 function generateTest() | 37 function generateTest() |
| 37 { | 38 { |
| 38 var bitmaps = []; | 39 var bitmaps = []; |
| 39 | 40 |
| 40 var canvas = document.getElementById("example"); | 41 var canvas = document.getElementById("example"); |
| 41 gl = canvas.getContext("webgl"); | 42 gl = canvas.getContext("webgl"); |
| 42 | 43 |
| 43 gl.clearColor(0,0,0,1); | 44 gl.clearColor(0,0,0,1); |
| 44 gl.clearDepth(1); | 45 gl.clearDepth(1); |
| 45 | 46 |
| 46 var p1 = createImageBitmap(image).then(function(imageBitmap) { bitmaps.defau
ltOption = imageBitmap }); | 47 var p1 = createImageBitmap(image1).then(function(imageBitmap) { bitmaps.defa
ultOption = imageBitmap }); |
| 47 var p2 = createImageBitmap(image, {imageOrientation: "none", premultiplyAlph
a: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBit
map }); | 48 var p2 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlp
ha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBi
tmap }); |
| 48 var p3 = createImageBitmap(image, {imageOrientation: "none", premultiplyAlph
a: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap
}); | 49 var p3 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlp
ha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitma
p }); |
| 49 var p4 = createImageBitmap(image, {imageOrientation: "none", premultiplyAlph
a: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }
); | 50 var p4 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlp
ha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap
}); |
| 50 var p5 = createImageBitmap(image, {imageOrientation: "flipY", premultiplyAlp
ha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitm
ap }); | 51 var p5 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAl
pha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBit
map }); |
| 51 var p6 = createImageBitmap(image, {imageOrientation: "flipY", premultiplyAlp
ha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap
}); | 52 var p6 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAl
pha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap
}); |
| 52 var p7 = createImageBitmap(image, {imageOrientation: "flipY", premultiplyAlp
ha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap })
; | 53 var p7 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAl
pha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap }
); |
| 53 var p8 = createImageBitmap(image).then(function(imageBitmap) { bitmaps.color
spaceDef = imageBitmap }); | 54 var p8 = createImageBitmap(image2).then(function(imageBitmap) { bitmaps.colo
rspaceDef = imageBitmap }); |
| 54 var p9 = createImageBitmap(image, {colorspaceConversion: "none"}).then(funct
ion(imageBitmap) { bitmaps.colorspaceNone = imageBitmap }); | 55 var p9 = createImageBitmap(image2, {colorspaceConversion: "none"}).then(func
tion(imageBitmap) { bitmaps.colorspaceNone = imageBitmap }); |
| 55 var p10 = createImageBitmap(image, {colorspaceConversion: "default"}).then(f
unction(imageBitmap) { bitmaps.colorspaceDefault = imageBitmap }); | 56 var p10 = createImageBitmap(image2, {colorspaceConversion: "default"}).then(
function(imageBitmap) { bitmaps.colorspaceDefault = imageBitmap }); |
| 56 Promise.all([p1, p2, p3, p4, p5, p6, p7, p8, p9, p10]).then(function() { | 57 Promise.all([p1, p2, p3, p4, p5, p6, p7, p8, p9, p10]).then(function() { |
| 57 var alphaVal = 0.5; | 58 var alphaVal = 0.5; |
| 58 var testPassed = runTest(bitmaps, alphaVal, false); | 59 var testPassed = runTest(bitmaps, alphaVal, true); |
| 59 if (testPassed) | 60 if (testPassed) |
| 60 pass(); | 61 pass(); |
| 61 finishJSTest(); | 62 finishJSTest(); |
| 62 }, function() { | 63 }, function() { |
| 63 promiseRejected(); | 64 promiseRejected(); |
| 64 finishJSTest(); | 65 finishJSTest(); |
| 65 }); | 66 }); |
| 66 } | 67 } |
| 67 | 68 |
| 68 function init() | 69 function init() |
| 69 { | 70 { |
| 70 if (window.testRunner) { | 71 if (window.testRunner) { |
| 71 testRunner.overridePreference("WebKitWebGLEnabled", "1"); | 72 testRunner.overridePreference("WebKitWebGLEnabled", "1"); |
| 72 testRunner.dumpAsText(); | 73 testRunner.dumpAsText(); |
| 73 } | 74 } |
| 74 image.onload = function() { | 75 image1.onload = function() { |
| 75 generateTest(); | 76 image2.onload = function() { |
| 77 generateTest(); |
| 78 } |
| 76 } | 79 } |
| 77 image.src = "resources/red-green-semi-transparent.png"; | 80 image1.src = "resources/red-green-semi-transparent.png"; |
| 81 image2.src = "resources/square-with-colorspin-profile.png"; |
| 78 } | 82 } |
| 79 </script> | 83 </script> |
| 80 </head> | 84 </head> |
| 81 <body onload="init()"> | 85 <body onload="init()"> |
| 82 <canvas id="texcanvas" width="2" height="2"></canvas> | 86 <canvas id="texcanvas" width="2" height="2"></canvas> |
| 83 <canvas id="example" width="32" height="32"></canvas> | 87 <canvas id="example" width="32" height="32"></canvas> |
| 84 <div id="results">Test <span style="color:red">FAILED</span></div> | 88 <div id="results">Test <span style="color:red">FAILED</span></div> |
| 85 </body> | 89 </body> |
| 86 </html> | 90 </html> |
| OLD | NEW |