diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 02:11:01 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 02:11:01 +0000 |
| commit | 15ca86a277ff0fce0b997087b6d16bcea805bfa2 (patch) | |
| tree | 3092223daf4f5f8fa7eae6aa0947cc5877114fbb | |
| parent | b904378c864707a531d803207fc2cfcc0c2af5be (diff) | |
| download | chromium_src-15ca86a277ff0fce0b997087b6d16bcea805bfa2.zip chromium_src-15ca86a277ff0fce0b997087b6d16bcea805bfa2.tar.gz chromium_src-15ca86a277ff0fce0b997087b6d16bcea805bfa2.tar.bz2 | |
Resize the gpu pixel tests.
1) to make the window smaller (but still larger than 128 x 128 to trigger HD canvas) so the test could be more efficient.
2) to make sure the scroll bar won't show. We will have a seperate test for composited scroll bar.
BUG=
TEST=gpu waterfall
TBR=vangelis
Review URL: https://chromiumcodereview.appspot.com/9195036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118395 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/data/gpu/pixel_canvas2d.html | 6 | ||||
| -rw-r--r-- | chrome/test/data/gpu/pixel_css3d.html | 8 | ||||
| -rw-r--r-- | chrome/test/data/gpu/pixel_webgl.html | 6 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_pixel_browsertest.cc | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/chrome/test/data/gpu/pixel_canvas2d.html b/chrome/test/data/gpu/pixel_canvas2d.html index a90afec..546d9e6 100644 --- a/chrome/test/data/gpu/pixel_canvas2d.html +++ b/chrome/test/data/gpu/pixel_canvas2d.html @@ -15,7 +15,7 @@ function main() var canvas = document.getElementById("c"); var c2d = canvas.getContext("2d"); c2d.fillStyle = "rgba(255, 0, 0, 0.5)"; - c2d.fillRect(100, 100, 200, 200); + c2d.fillRect(50, 50, 100, 100); waitForFinish(); } @@ -32,10 +32,10 @@ function waitForFinish() </script> </head> <body onload="main()"> -<div style="position:relative; width:400px; height:520px; background-color:black"> +<div style="position:relative; width:200px; height:200px; background-color:black"> </div> <div style="position:absolute; top:0px; left:0px"> -<canvas id="c" width="400" height="400" class="nomargin"></canvas> +<canvas id="c" width="200" height="200" class="nomargin"></canvas> </div> </body> </html> diff --git a/chrome/test/data/gpu/pixel_css3d.html b/chrome/test/data/gpu/pixel_css3d.html index 7541dfe..aade4cf 100644 --- a/chrome/test/data/gpu/pixel_css3d.html +++ b/chrome/test/data/gpu/pixel_css3d.html @@ -13,9 +13,9 @@ #container > div { position: relative; - margin: 100px; - width: 250px; - height: 150px; + margin: 50px; + width: 125px; + height: 75px; } #container > :first-child { @@ -44,7 +44,7 @@ function waitForFinish() </script> </head> <body onload="main()"> -<div style="position:relative; width:400px; height:520px; background-color:black"> +<div style="position:relative; width:200px; height:200px; background-color:black"> </div> <div id="container" style="position:absolute; top:0px; left:0px"> <div id="blue_box"></div> diff --git a/chrome/test/data/gpu/pixel_webgl.html b/chrome/test/data/gpu/pixel_webgl.html index 876d2d2..79f9315 100644 --- a/chrome/test/data/gpu/pixel_webgl.html +++ b/chrome/test/data/gpu/pixel_webgl.html @@ -110,7 +110,7 @@ function setup(gl) { var stride = 3 * Float32Array.BYTES_PER_ELEMENT; gl.vertexAttribPointer(posAttr, 3, gl.FLOAT, false, stride, 0); gl.clearColor(0.0, 0.0, 0.0, 0.0); - gl.viewport(0, 0, 400, 400); + gl.viewport(0, 0, 200, 200); gl.disable(gl.DEPTH_TEST); if (gl.getError() != gl.NO_ERROR) return false; @@ -124,9 +124,9 @@ function draw(gl) { </script> </head> <body onload="main()"> -<div style="position:relative; width:400px; height:520px; background-color:black"></div> +<div style="position:relative; width:200px; height:200px; background-color:black"></div> <div style="position:absolute; top:0px; left:0px"> -<canvas id="c" width="400" height="400" class="nomargin"></canvas> +<canvas id="c" width="200" height="200" class="nomargin"></canvas> </div> </body> </html> diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index a1c2599..4db990f4 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -351,7 +351,7 @@ IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLGreenTriangle) { // following number. If no revision requirement, then 0. const int64 ref_img_revision_update = 118166; - gfx::Size container_size(500, 500); + gfx::Size container_size(250, 250); FilePath url = test_data_dir().AppendASCII("pixel_webgl.html"); RunPixelTest(container_size, url, ref_img_revision_update); @@ -367,7 +367,7 @@ IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_CSS3DBlueBox) { // following number. If no revision requirement, then 0. const int64 ref_img_revision_update = 0; - gfx::Size container_size(500, 500); + gfx::Size container_size(250, 250); FilePath url = test_data_dir().AppendASCII("pixel_css3d.html"); RunPixelTest(container_size, url, ref_img_revision_update); @@ -391,7 +391,7 @@ IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestHD, MAYBE_Canvas2DRedBoxHD) { // following number. If no revision requirement, then 0. const int64 ref_img_revision_update = 118166; - gfx::Size container_size(500, 500); + gfx::Size container_size(250, 250); FilePath url = test_data_dir().AppendASCII("pixel_canvas2d.html"); RunPixelTest(container_size, url, ref_img_revision_update); @@ -415,7 +415,7 @@ IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, MAYBE_Canvas2DRedBoxSD) { // following number. If no revision requirement, then 0. const int64 ref_img_revision_update = 118166; - gfx::Size container_size(500, 500); + gfx::Size container_size(250, 250); FilePath url = test_data_dir().AppendASCII("pixel_canvas2d.html"); RunPixelTest(container_size, url, ref_img_revision_update); |