diff options
author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 00:04:05 +0000 |
---|---|---|
committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 00:04:05 +0000 |
commit | f9c8928e81b64ac58a9119a85f49da2b66dd65b9 (patch) | |
tree | d138052c145e80f934b7161b2f585418a91c7e83 /content/test | |
parent | 03ba191c1308120bbb9bd116d8ceb16bcafa0f94 (diff) | |
download | chromium_src-f9c8928e81b64ac58a9119a85f49da2b66dd65b9.zip chromium_src-f9c8928e81b64ac58a9119a85f49da2b66dd65b9.tar.gz chromium_src-f9c8928e81b64ac58a9119a85f49da2b66dd65b9.tar.bz2 |
Get GpuCrashTest running in content_browsertests.
1) The test class name should begin with "Gpu" to be picked by gpu bot filters.
2) implify gpu crash tests by directly call the SimulateCrash function. Before we open a new tab, go to about:gpucrash. This is really unnecessary.
3) Disable infobar stuff for Kill - otherwise the GPU process won't launch after crashing.
4) Clean up the webgl.html a little bit.
BUG=111506
TEST=gpu bots
Review URL: https://codereview.chromium.org/11824045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r-- | content/test/data/gpu/webgl.html | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/content/test/data/gpu/webgl.html b/content/test/data/gpu/webgl.html index 18bed47..001c569 100644 --- a/content/test/data/gpu/webgl.html +++ b/content/test/data/gpu/webgl.html @@ -34,6 +34,7 @@ function testContextLost(e) { if (extension) { setTimeout(function() { extension.restoreContext(); + extension = null; }, 0); } } @@ -85,31 +86,21 @@ function onLoad() { canvas = document.getElementById("canvas1"); w = canvas.width; h = canvas.height; - if (!canvas) { - document.title = "FAILED: canvas element not found"; + if (!canvas) return; - } canvas.addEventListener("webglcontextlost", testContextLost, false); canvas.addEventListener("webglcontextrestored", testContextRestored, false); gl = canvas.getContext("experimental-webgl"); - if (!gl) { - document.title = "FAILED: could not get webgl context for canvas"; + if (!gl) return; - } - if (!testHorizontalBands()) { - document.title = "FAILED: did not render correctly"; + if (!testHorizontalBands()) return; - } var query = /query=(.*)/.exec(window.location.href); - if (query) { + if (query) contextLostTest(query[1]); - } else { - var renderer = gl.getParameter(gl.RENDERER); - document.title = "SUCCESS: " + renderer; - } } </script> </head> |