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

Unified Diff: cc/gl_renderer_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 | « no previous file | cc/layer_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/gl_renderer_unittest.cc
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 1b645956f399ab2e9103bfbd1e40871b1bdb1e87..078c066db03e0b16bca898f85cf7d14fdfbe40bb 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -136,7 +136,7 @@ protected:
WebCompositorInitializer m_compositorInitializer;
scoped_ptr<CCGraphicsContext> m_context;
FakeCCRendererClient m_mockClient;
- OwnPtr<CCResourceProvider> m_resourceProvider;
+ scoped_ptr<CCResourceProvider> m_resourceProvider;
FakeCCRendererGL m_renderer;
CCScopedSettings m_scopedSettings;
};
@@ -298,7 +298,7 @@ TEST(CCRendererGLTest2, initializationDoesNotMakeSynchronousCalls)
CCScopedSettings scopedSettings;
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ForbidSynchronousCallContext)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
EXPECT_TRUE(renderer.initialize());
@@ -342,7 +342,7 @@ TEST(CCRendererGLTest2, initializationWithQuicklyLostContextDoesNotAssert)
CCScopedSettings scopedSettings;
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new LoseContextOnFirstGetContext)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
renderer.initialize();
@@ -364,7 +364,7 @@ TEST(CCRendererGLTest2, initializationWithoutGpuMemoryManagerExtensionSupportSho
{
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> context(FakeWebCompositorOutputSurface::create(adoptPtr(new ContextThatDoesNotSupportMemoryManagmentExtensions)));
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
renderer.initialize();
@@ -392,7 +392,7 @@ TEST(CCRendererGLTest2, opaqueBackground)
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));
ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
mockClient.rootRenderPass()->setHasTransparentBackground(false);
@@ -415,7 +415,7 @@ TEST(CCRendererGLTest2, transparentBackground)
FakeCCRendererClient mockClient;
scoped_ptr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));
ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
mockClient.rootRenderPass()->setHasTransparentBackground(true);
« no previous file with comments | « no previous file | cc/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698