Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <!-- This is a test for crbug.com/412440, tests meaningful information in | 1 <!-- This is a test for crbug.com/412440, tests meaningful information in |
| 2 WebGL context creation error message. --> | 2 WebGL context creation error message. --> |
| 3 <script src="../../../resources/js-test.js"></script> | 3 <script src="../../../resources/js-test.js"></script> |
| 4 <canvas id="webgl-canvas" width="200" height="200" class="nomargin"></canvas> | 4 <canvas id="webgl-canvas" width="200" height="200" class="nomargin"></canvas> |
| 5 <script> | 5 <script> |
| 6 function main() | 6 function main() |
| 7 { | 7 { |
| 8 if (!window.testRunner) { | 8 if (!window.testRunner) { |
| 9 testFailed("Requires window.testRunner"); | 9 testFailed("Requires window.testRunner"); |
| 10 } else { | 10 } else { |
| 11 initTest(); | 11 initTest(); |
| 12 } | 12 } |
| 13 } | 13 } |
| 14 | 14 |
| 15 function initTest() { | 15 function initTest() { |
| 16 var canvas = document.getElementById("webgl-canvas"); | 16 var canvas = document.getElementById("webgl-canvas"); |
| 17 testRunner.forceNextWebGLContextCreationToFail(); | 17 testRunner.forceNextWebGLContextCreationToFail(); |
| 18 canvas.addEventListener("webglcontextcreationerror", onContextCreationError, f alse); | 18 canvas.addEventListener("webglcontextcreationerror", onContextCreationError, f alse); |
| 19 var gl = canvas.getContext("webgl"); | 19 var gl = canvas.getContext("webgl"); |
| 20 testRunner.dumpAsText(); | 20 testRunner.dumpAsText(); |
| 21 } | 21 } |
| 22 | 22 |
| 23 function onContextCreationError(e) { | 23 function onContextCreationError(e) { |
| 24 var splitStatus = e.statusMessage.split(","); | 24 var splitStatus = e.statusMessage.split(","); |
| 25 var stringLocator = 1; | 25 var error = ""; |
| 26 var status = true; | |
| 27 // Start iterating from 1 as , the initial message has no data. | |
| 28 for (var i = 1; i < splitStatus.length; i++) { | 26 for (var i = 1; i < splitStatus.length; i++) { |
| 29 var gpuInfoStr = splitStatus[i].split(" = "); | 27 var gpuInfoStr = splitStatus[i].split(" = "); |
| 30 if (gpuInfoStr[stringLocator] == "") | 28 var key = gpuInfoStr[0].trim(); |
| 31 status = false; | 29 var value = gpuInfoStr[1]; |
| 30 if(key == "DEVICE" && (value == "0x0000" || value == "")) | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Space after "if".
sivag
2015/10/16 18:29:20
Done.
| |
| 31 error = error +"DeviceID is null."; | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Add space after "+".
sivag
2015/10/16 18:29:19
Done.
| |
| 32 if(key == "VENDOR" && (value == "0x0000" || value == "")) | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Space after "if".
sivag
2015/10/16 18:29:19
Done.
| |
| 33 error = error + "VendorID is null."; | |
| 34 if((key != "GL_VENDOR" || | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Space after "if".
sivag
2015/10/16 18:29:20
Done.
| |
| 35 key != "GL_RENDERER" || | |
| 36 key != "GL_VERSION" || | |
| 37 key != "Sandboxed" || | |
| 38 key != "Optimus" || | |
| 39 key != "AMD switchable" || | |
| 40 key != "Reset notification strategy" || | |
| 41 key != "GPU process crash count" || | |
| 42 key != "ErrorMessage") && (value == "")) | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Please use an open-brace after the parenthesis her
sivag
2015/10/16 18:29:19
Done.
| |
| 43 error = error + "Gpu data is incorrect."; | |
|
Zhenyao Mo
2015/10/15 22:30:37
This condition is true if key == "DEVICE" or "VEND
sivag
2015/10/16 18:29:19
Done.
sivag
2015/10/16 18:29:20
i corrected it, it was supposed to check if one of
| |
| 32 } | 44 } |
| 33 if(status) | 45 if(error.length) |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Space after "if".
sivag
2015/10/16 18:29:19
Done.
| |
| 46 testFailed("webglcontextcreationerror test failed" + error); | |
| 47 else | |
| 34 testPassed("Status message displayed for webglcontextcreationerror"); | 48 testPassed("Status message displayed for webglcontextcreationerror"); |
| 35 else | 49 |
| 36 testFailed("Context creation error test failed"); | |
| 37 } | 50 } |
| 38 main(); | 51 main(); |
| 39 </script> | 52 </script> |
| OLD | NEW |