diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:07:36 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 19:07:36 +0000 |
| commit | 155399dd35c53dddae3d9dbcd7200c8f3999e6ef (patch) | |
| tree | 3ffea43c0ee03e39e6e32d2069a84cf48eb55ed1 /cc/output/gl_renderer_unittest.cc | |
| parent | 4c49e99611219800c5f85acd0bbc89f405622961 (diff) | |
| download | chromium_src-155399dd35c53dddae3d9dbcd7200c8f3999e6ef.zip chromium_src-155399dd35c53dddae3d9dbcd7200c8f3999e6ef.tar.gz chromium_src-155399dd35c53dddae3d9dbcd7200c8f3999e6ef.tar.bz2 | |
Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."
CrOS bots are unhappy
> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
>
> 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
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13334005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/gl_renderer_unittest.cc')
| -rw-r--r-- | cc/output/gl_renderer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index 9bbed71..9a7f281 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(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 @@ TEST(GLRendererTest2, ActiveTextureState) { 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); } |