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

Unified Diff: cc/CCDelegatedRendererLayerImpl.cpp

Issue 10989024: cc: Remove OwnPtr usage from CCRenderPass and CCDrawQuad class hierarchy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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/CCDebugBorderDrawQuad.cpp ('k') | cc/CCDelegatedRendererLayerImplTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDelegatedRendererLayerImpl.cpp
diff --git a/cc/CCDelegatedRendererLayerImpl.cpp b/cc/CCDelegatedRendererLayerImpl.cpp
index 237f01f32971647639446de170a02af986e1cc22..4c6c753653df0809df28a06956e0a65a35e95b92 100644
--- a/cc/CCDelegatedRendererLayerImpl.cpp
+++ b/cc/CCDelegatedRendererLayerImpl.cpp
@@ -160,7 +160,7 @@ void CCDelegatedRendererLayerImpl::appendRenderPassQuads(CCQuadSink& quadSink, C
copiedSharedQuadState->opacity *= drawOpacity();
}
- OwnPtr<CCDrawQuad> copyQuad;
+ scoped_ptr<CCDrawQuad> copyQuad;
if (quad->material() != CCDrawQuad::RenderPass)
copyQuad = quad->copy(copiedSharedQuadState);
else {
@@ -168,11 +168,11 @@ void CCDelegatedRendererLayerImpl::appendRenderPassQuads(CCQuadSink& quadSink, C
CCRenderPass::Id contributingRenderPassId = convertDelegatedRenderPassId(contributingDelegatedRenderPassId);
ASSERT(contributingRenderPassId != appendQuadsData.renderPassId);
- copyQuad = CCRenderPassDrawQuad::materialCast(quad)->copy(copiedSharedQuadState, contributingRenderPassId);
+ copyQuad = CCRenderPassDrawQuad::materialCast(quad)->copy(copiedSharedQuadState, contributingRenderPassId).PassAs<CCDrawQuad>();
}
- ASSERT(copyQuad);
+ ASSERT(copyQuad.get());
- quadSink.append(copyQuad.release(), appendQuadsData);
+ quadSink.append(copyQuad.Pass(), appendQuadsData);
}
}
« no previous file with comments | « cc/CCDebugBorderDrawQuad.cpp ('k') | cc/CCDelegatedRendererLayerImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698