diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:19:08 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:19:08 +0000 |
| commit | ce638d154c6e8618b8df761115a5a9e2c9d8a106 (patch) | |
| tree | faff62a8bee25f77d93d6837b121ca8fa639bf29 /cc/output/gl_renderer_unittest.cc | |
| parent | e5bd68e150c9d2b46187d2d1a7d948f709760d34 (diff) | |
| download | chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.zip chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.tar.gz chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191400 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 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<unsigned>(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<unsigned>(GL_TEXTURE0), context->active_texture()); Mock::VerifyAndClearExpectations(context); } |