Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2783)

Unified Diff: cc/output/gl_renderer_unittest.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 2e991c5833bba057c5aee1a8a731cd0fd0131850..70e179199f06d0c28203dd6d3b3f9fadb9c3a963 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -849,7 +849,7 @@ TEST(GLRendererTest2, ActiveTextureState) {
cc::DirectRenderer::DrawingFrame drawing_frame;
renderer.BeginDrawingFrame(&drawing_frame);
- EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
+ EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
for (cc::QuadList::BackToFrontIterator
it = pass->quad_list.BackToFrontBegin();
@@ -858,7 +858,7 @@ TEST(GLRendererTest2, ActiveTextureState) {
renderer.DoDrawQuad(&drawing_frame, *it);
}
renderer.FinishDrawingQuadList();
- EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
+ EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
Mock::VerifyAndClearExpectations(context);
}

Powered by Google App Engine
This is Rietveld 408576698