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

Unified Diff: cc/layer_tree_host_impl_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/layer_tree_host_impl.cc ('k') | cc/prioritized_texture_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 9220e64faafee672d1c20e1cc9498698c8b92930..730583103d92c8569043c2cfc457b853f1ee8cdf 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -4020,13 +4020,13 @@ struct RenderPassRemovalTestData : public CCLayerTreeHostImpl::FrameData {
class CCTestRenderer : public CCRendererGL, public CCRendererClient {
public:
- static PassOwnPtr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
+ static scoped_ptr<CCTestRenderer> create(CCResourceProvider* resourceProvider)
{
- OwnPtr<CCTestRenderer> renderer(adoptPtr(new CCTestRenderer(resourceProvider)));
+ scoped_ptr<CCTestRenderer> renderer(new CCTestRenderer(resourceProvider));
if (!renderer->initialize())
- return nullptr;
+ return scoped_ptr<CCTestRenderer>();
- return renderer.release();
+ return renderer.Pass();
}
void clearCachedTextures() { m_textures.clear(); }
@@ -4326,9 +4326,9 @@ TEST_P(CCLayerTreeHostImplTest, testRemoveRenderPasses)
{
scoped_ptr<CCGraphicsContext> context(createContext());
ASSERT_TRUE(context->context3D());
- OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
+ scoped_ptr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
- OwnPtr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
+ scoped_ptr<CCTestRenderer> renderer(CCTestRenderer::create(resourceProvider.get()));
int testCaseIndex = 0;
while (removeRenderPassesCases[testCaseIndex].name) {
« no previous file with comments | « cc/layer_tree_host_impl.cc ('k') | cc/prioritized_texture_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698