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

Unified Diff: cc/scoped_texture_unittest.cc

Issue 11183006: cc: Remove wtf includes from resource provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 2 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 | « cc/resource_provider_unittest.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scoped_texture_unittest.cc
diff --git a/cc/scoped_texture_unittest.cc b/cc/scoped_texture_unittest.cc
index a2b0c53a2f672896dcd3a79e00e99d57d8f9617b..44260ac2be0c3000f8c9d239e33f68a41f811354 100644
--- a/cc/scoped_texture_unittest.cc
+++ b/cc/scoped_texture_unittest.cc
@@ -23,7 +23,7 @@ TEST(CCScopedTextureTest, NewScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
// New scoped textures do not hold a texture yet.
@@ -38,7 +38,7 @@ TEST(CCScopedTextureTest, CreateScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
texture->allocate(CCRenderer::ImplPool, IntSize(30, 30), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny);
@@ -55,7 +55,7 @@ TEST(CCScopedTextureTest, ScopedTextureIsDeleted)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
{
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
@@ -83,7 +83,7 @@ TEST(CCScopedTextureTest, LeakScopedTexture)
{
scoped_ptr<CCGraphicsContext> context(createFakeCCGraphicsContext());
DebugScopedSetImplThread implThread;
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
{
scoped_ptr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698