| 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);
|
| }
|
| }
|
|
|
|
|