| Index: content/browser/compositor/gl_helper_unittest.cc
|
| diff --git a/content/browser/compositor/gl_helper_unittest.cc b/content/browser/compositor/gl_helper_unittest.cc
|
| index 9ba79b7f89f09914e174fdac00e000c632a5d322..dcffbba5b0be6b73272bd4dcf9fec20c202c071f 100644
|
| --- a/content/browser/compositor/gl_helper_unittest.cc
|
| +++ b/content/browser/compositor/gl_helper_unittest.cc
|
| @@ -1254,8 +1254,7 @@ class GLHelperTest : public testing::Test {
|
| int ymargin,
|
| int test_pattern,
|
| bool flip,
|
| - bool use_mrt,
|
| - content::GLHelper::ScalerQuality quality) {
|
| + bool use_mrt) {
|
| GLuint src_texture;
|
| gl_->GenTextures(1, &src_texture);
|
| SkBitmap input_pixels;
|
| @@ -1309,7 +1308,7 @@ class GLHelperTest : public testing::Test {
|
| test_pattern, flip ? "flip" : "noflip", 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), gfx::Rect(0, 0, xsize, ysize),
|
| gfx::Size(xsize, ysize), flip, use_mrt));
|
|
|
| scoped_refptr<media::VideoFrame> output_frame =
|
| @@ -1634,8 +1633,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);
|
| @@ -1684,7 +1682,7 @@ TEST_P(GLHelperPixelYuvReadback, Test) {
|
| 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);
|
| + pattern, flip, use_mrt);
|
| if (HasFailure()) {
|
| return;
|
| }
|
|
|