From 3209161d2f32bf14d594e455402be6d5ca09580b Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Fri, 29 Mar 2013 19:17:34 +0000 Subject: =?UTF-8?q?cc:=20Fix=20build=20issues=20for=20adding=20=E2=80=98ch?= =?UTF-8?q?romium=5Fcode=E2=80=99:=201=20to=20cc.gyp=20and=20cc=5Ftests.gy?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flag flip will be a follow up once ChromeOS build is sorted out. Review URL: https://codereview.chromium.org/13206004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191417 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/resources/scoped_resource_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cc/resources/scoped_resource_unittest.cc') diff --git a/cc/resources/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc index a9a087e..97e93d2 100644 --- a/cc/resources/scoped_resource_unittest.cc +++ b/cc/resources/scoped_resource_unittest.cc @@ -42,7 +42,7 @@ TEST(ScopedResourceTest, CreateScopedResource) { EXPECT_EQ(expected_bytes, texture->bytes()); EXPECT_LT(0u, texture->id()); - EXPECT_EQ(GL_RGBA, texture->format()); + EXPECT_EQ(static_cast(GL_RGBA), texture->format()); EXPECT_EQ(gfx::Size(30, 30), texture->size()); } -- cgit v1.1