Chromium Code Reviews| Index: cc/output/gl_renderer.cc |
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc |
| index a32778a437038b86816ea6c47aa522160e65c6fe..b1344ea9fb404a5c418974cd2191c861005d4039 100644 |
| --- a/cc/output/gl_renderer.cc |
| +++ b/cc/output/gl_renderer.cc |
| @@ -1628,7 +1628,8 @@ void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame, |
| SetupQuadForAntialiasing(device_transform, quad, &local_quad, edge); |
| ResourceProvider::ScopedSamplerGL quad_resource_lock( |
| - resource_provider_, resource_id, GL_LINEAR); |
| + resource_provider_, resource_id, |
| + quad->nearest_neighbor ? GL_NEAREST : GL_LINEAR); |
| SamplerType sampler = |
| SamplerTypeFromTextureTarget(quad_resource_lock.target()); |
| @@ -1712,7 +1713,8 @@ void GLRenderer::DrawContentQuadNoAA(const DrawingFrame* frame, |
| bool scaled = (tex_to_geom_scale_x != 1.f || tex_to_geom_scale_y != 1.f); |
| GLenum filter = |
| - (scaled || !quad->quadTransform().IsIdentityOrIntegerTranslation()) |
| + (scaled || !quad->quadTransform().IsIdentityOrIntegerTranslation()) && |
| + !quad->nearest_neighbor |
|
danakj
2014/12/09 19:44:45
is this what git cl format does for formatting?
jackhou1
2014/12/10 01:04:15
Yup.
|
| ? GL_LINEAR |
| : GL_NEAREST; |