From ce638d154c6e8618b8df761115a5a9e2c9d8a106 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Fri, 29 Mar 2013 18:19:08 +0000 Subject: =?UTF-8?q?cc:=20Add=20=E2=80=98chromium=5Fcode=E2=80=99:=201=20to?= =?UTF-8?q?=20cc.gyp=20and=20cc=5Ftests.gyp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And fix compile errors that it causes. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191364 Review URL: https://codereview.chromium.org/13206004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191400 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/output/gl_renderer_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cc/output/gl_renderer_unittest.cc') diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index 9a7f281..9bbed71 100644 --- a/cc/output/gl_renderer_unittest.cc +++ b/cc/output/gl_renderer_unittest.cc @@ -861,7 +861,7 @@ TEST(GLRendererTest2, ActiveTextureState) { cc::DirectRenderer::DrawingFrame drawing_frame; renderer.BeginDrawingFrame(&drawing_frame); - EXPECT_EQ(context->active_texture(), GL_TEXTURE0); + EXPECT_EQ(static_cast(GL_TEXTURE0), context->active_texture()); for (cc::QuadList::BackToFrontIterator it = pass->quad_list.BackToFrontBegin(); @@ -870,7 +870,7 @@ TEST(GLRendererTest2, ActiveTextureState) { renderer.DoDrawQuad(&drawing_frame, *it); } renderer.FinishDrawingQuadList(); - EXPECT_EQ(context->active_texture(), GL_TEXTURE0); + EXPECT_EQ(static_cast(GL_TEXTURE0), context->active_texture()); Mock::VerifyAndClearExpectations(context); } -- cgit v1.1