| Index: content/common/gpu/client/gl_helper_unittest.cc
|
| diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc
|
| index a3fb99e60c8473447c5994c465844bc232560f20..bdf022e3f083aff0500309c186dc81e10ad6331b 100644
|
| --- a/content/common/gpu/client/gl_helper_unittest.cc
|
| +++ b/content/common/gpu/client/gl_helper_unittest.cc
|
| @@ -1322,8 +1322,7 @@ class GLHelperTest : public testing::Test {
|
| int ymargin,
|
| int test_pattern,
|
| bool flip,
|
| - bool use_mrt,
|
| - content::GLHelper::ScalerQuality quality) {
|
| + bool use_mrt) {
|
| WebGLId src_texture = context_->createTexture();
|
| SkBitmap input_pixels;
|
| input_pixels.allocN32Pixels(xsize, ysize);
|
| @@ -1391,7 +1390,6 @@ class GLHelperTest : public testing::Test {
|
| flip ? "mrt" : "nomrt");
|
| scoped_ptr<ReadbackYUVInterface> yuv_reader(
|
| helper_->CreateReadbackPipelineYUV(
|
| - quality,
|
| gfx::Size(xsize, ysize),
|
| gfx::Rect(0, 0, xsize, ysize),
|
| gfx::Size(xsize, ysize),
|
| @@ -1768,16 +1766,7 @@ TEST_F(GLHelperPixelTest, YUVReadbackOptTest) {
|
| StartTracing(TRACE_DISABLED_BY_DEFAULT("gpu.service") ","
|
| TRACE_DISABLED_BY_DEFAULT("gpu_decoder"));
|
|
|
| - TestYUVReadback(800,
|
| - 400,
|
| - 800,
|
| - 400,
|
| - 0,
|
| - 0,
|
| - 1,
|
| - false,
|
| - true,
|
| - content::GLHelper::SCALER_QUALITY_FAST);
|
| + TestYUVReadback(800, 400, 800, 400, 0, 0, 1, false, true);
|
|
|
| std::map<std::string, int> event_counts;
|
| EndTracing(&event_counts);
|
| @@ -1823,18 +1812,12 @@ TEST_P(GLHelperPixelYuvReadback, Test) {
|
| ym <= MarginRight;
|
| ym = NextMargin(ym)) {
|
| for (int pattern = 0; pattern < 3; pattern++) {
|
| - TestYUVReadback(kYUVReadBackSizes[x],
|
| - kYUVReadBackSizes[y],
|
| - kYUVReadBackSizes[ox],
|
| - kYUVReadBackSizes[oy],
|
| - compute_margin(kYUVReadBackSizes[x],
|
| - kYUVReadBackSizes[ox], xm),
|
| - compute_margin(kYUVReadBackSizes[y],
|
| - kYUVReadBackSizes[oy], ym),
|
| - pattern,
|
| - flip,
|
| - use_mrt,
|
| - content::GLHelper::SCALER_QUALITY_GOOD);
|
| + TestYUVReadback(
|
| + kYUVReadBackSizes[x], kYUVReadBackSizes[y],
|
| + kYUVReadBackSizes[ox], kYUVReadBackSizes[oy],
|
| + compute_margin(kYUVReadBackSizes[x], kYUVReadBackSizes[ox], xm),
|
| + compute_margin(kYUVReadBackSizes[y], kYUVReadBackSizes[oy], ym),
|
| + pattern, flip, use_mrt);
|
| if (HasFailure()) {
|
| return;
|
| }
|
|
|