| Index: cc/CCRenderPassDrawQuad.cpp
|
| diff --git a/cc/CCRenderPassDrawQuad.cpp b/cc/CCRenderPassDrawQuad.cpp
|
| index bee85719a453ea2abafba343a4d8067206c13a4c..9e385c67c1f3c7b4b9db10d5c6c9614eaa559965 100644
|
| --- a/cc/CCRenderPassDrawQuad.cpp
|
| +++ b/cc/CCRenderPassDrawQuad.cpp
|
| @@ -10,7 +10,7 @@ namespace cc {
|
|
|
| scoped_ptr<CCRenderPassDrawQuad> CCRenderPassDrawQuad::create(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, const CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY)
|
| {
|
| - return scoped_ptr<CCRenderPassDrawQuad>(new CCRenderPassDrawQuad(sharedQuadState, quadRect, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY));
|
| + return make_scoped_ptr(new CCRenderPassDrawQuad(sharedQuadState, quadRect, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY));
|
| }
|
|
|
| CCRenderPassDrawQuad::CCRenderPassDrawQuad(const CCSharedQuadState* sharedQuadState, const IntRect& quadRect, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY)
|
| @@ -47,4 +47,4 @@ scoped_ptr<CCRenderPassDrawQuad> CCRenderPassDrawQuad::copy(const CCSharedQuadSt
|
| return copyQuad.Pass();
|
| }
|
|
|
| -}
|
| +} // namespace cc
|
|
|