| Index: cc/gl_renderer_unittest.cc
|
| diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
|
| index 34f997282d334ad0cb54ee46e40512bde369351f..89603b1ece65c8fc80ad1e4ae92a6678a0ed091f 100644
|
| --- a/cc/gl_renderer_unittest.cc
|
| +++ b/cc/gl_renderer_unittest.cc
|
| @@ -538,7 +538,7 @@ TEST(GLRendererTest2, activeTextureState)
|
| cc::RenderPass::Id id(1, 1);
|
| scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
|
| pass->SetNew(id, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100), gfx::Transform());
|
| - pass->AppendOneOfEveryQuadType(resourceProvider.get());
|
| + pass->AppendOneOfEveryQuadType(resourceProvider.get(), RenderPass::Id(2, 1));
|
|
|
| // Set up expected texture filter state transitions that match the quads
|
| // created in AppendOneOfEveryQuadType().
|
| @@ -546,7 +546,7 @@ TEST(GLRendererTest2, activeTextureState)
|
| {
|
| InSequence sequence;
|
|
|
| - // yuv_quad is drawn with the default filter.
|
| + // yuv_quad is drawn with the default linear filter.
|
| EXPECT_CALL(*context, drawElements(_, _, _, _));
|
|
|
| // tile_quad is drawn with GL_NEAREST because it is not transformed or
|
| @@ -556,8 +556,6 @@ TEST(GLRendererTest2, activeTextureState)
|
| EXPECT_CALL(*context, drawElements(_, _, _, _));
|
|
|
| // transformed_tile_quad uses GL_LINEAR.
|
| - EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
|
| - EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
|
| EXPECT_CALL(*context, drawElements(_, _, _, _));
|
|
|
| // scaled_tile_quad also uses GL_LINEAR.
|
|
|