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

Unified Diff: trunk/src/cc/output/gl_renderer_unittest.cc

Issue 13334005: Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
« no previous file with comments | « trunk/src/cc/output/gl_renderer.cc ('k') | trunk/src/cc/output/output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/cc/output/gl_renderer_unittest.cc
===================================================================
--- trunk/src/cc/output/gl_renderer_unittest.cc (revision 191411)
+++ trunk/src/cc/output/gl_renderer_unittest.cc (working copy)
@@ -861,7 +861,7 @@
cc::DirectRenderer::DrawingFrame drawing_frame;
renderer.BeginDrawingFrame(&drawing_frame);
- EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
+ EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
for (cc::QuadList::BackToFrontIterator
it = pass->quad_list.BackToFrontBegin();
@@ -870,7 +870,7 @@
renderer.DoDrawQuad(&drawing_frame, *it);
}
renderer.FinishDrawingQuadList();
- EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
+ EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
Mock::VerifyAndClearExpectations(context);
}
« no previous file with comments | « trunk/src/cc/output/gl_renderer.cc ('k') | trunk/src/cc/output/output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698