diff options
| author | yux@google.com <yux@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 01:07:36 +0000 |
|---|---|---|
| committer | yux@google.com <yux@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 01:07:36 +0000 |
| commit | 128ff759facb55e3c0c1326e97c00b325ac3f484 (patch) | |
| tree | 868fda83a815ac414abac1466091faced5bc3eb1 /o3d/core/cross/renderer_test.cc | |
| parent | 267088ffb702c649bfd2c1123f1f9c3f391b69d2 (diff) | |
| download | chromium_src-128ff759facb55e3c0c1326e97c00b325ac3f484.zip chromium_src-128ff759facb55e3c0c1326e97c00b325ac3f484.tar.gz chromium_src-128ff759facb55e3c0c1326e97c00b325ac3f484.tar.bz2 | |
expose bitmap in js.
Review URL: http://codereview.chromium.org/150058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/renderer_test.cc')
| -rw-r--r-- | o3d/core/cross/renderer_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/o3d/core/cross/renderer_test.cc b/o3d/core/cross/renderer_test.cc index c52645b..4c4acdd 100644 --- a/o3d/core/cross/renderer_test.cc +++ b/o3d/core/cross/renderer_test.cc @@ -118,14 +118,14 @@ TEST_F(RendererTest, OffScreen) { // TODO: add InitAndDestroyGL and InitAndDestroyMock TEST_F(RendererTest, Creates2DTextureFromBitmap) { - Bitmap bitmap; - bitmap.Allocate(Texture::ARGB8, 16, 32, 2, false); - memset(bitmap.image_data(), 0x34, bitmap.GetTotalSize()); + Bitmap::Ref bitmap(new Bitmap(g_service_locator)); + bitmap->Allocate(Texture::ARGB8, 16, 32, 2, false); + memset(bitmap->image_data(), 0x34, bitmap->GetTotalSize()); Client client(g_service_locator); client.Init(); - Texture::Ref texture = g_renderer->CreateTextureFromBitmap(&bitmap); + Texture::Ref texture = g_renderer->CreateTextureFromBitmap(bitmap); ASSERT_TRUE(NULL != texture); EXPECT_EQ(Texture::ARGB8, texture->format()); EXPECT_EQ(2, texture->levels()); @@ -137,14 +137,14 @@ TEST_F(RendererTest, Creates2DTextureFromBitmap) { } TEST_F(RendererTest, CreatesCubeTextureFromBitmap) { - Bitmap bitmap; - bitmap.Allocate(Texture::ARGB8, 16, 16, 2, true); - memset(bitmap.image_data(), 0x34, bitmap.GetTotalSize()); + Bitmap::Ref bitmap(new Bitmap(g_service_locator)); + bitmap->Allocate(Texture::ARGB8, 16, 16, 2, true); + memset(bitmap->image_data(), 0x34, bitmap->GetTotalSize()); Client client(g_service_locator); client.Init(); - Texture::Ref texture = g_renderer->CreateTextureFromBitmap(&bitmap); + Texture::Ref texture = g_renderer->CreateTextureFromBitmap(bitmap); ASSERT_TRUE(NULL != texture); EXPECT_EQ(Texture::ARGB8, texture->format()); EXPECT_EQ(2, texture->levels()); |