| Index: cc/CCDrawQuad.cpp
|
| diff --git a/cc/CCDrawQuad.cpp b/cc/CCDrawQuad.cpp
|
| index b3c3889ec3cfb4b3ab26abf2049ada196be4cb10..b88eac68610a4a01ab19ec3619f574e54d806494 100644
|
| --- a/cc/CCDrawQuad.cpp
|
| +++ b/cc/CCDrawQuad.cpp
|
| @@ -76,7 +76,7 @@ unsigned CCDrawQuad::size() const
|
| return sizeof(CCDrawQuad);
|
| }
|
|
|
| -PassOwnPtr<CCDrawQuad> CCDrawQuad::copy(const CCSharedQuadState* copiedSharedQuadState) const
|
| +scoped_ptr<CCDrawQuad> CCDrawQuad::copy(const CCSharedQuadState* copiedSharedQuadState) const
|
| {
|
| // RenderPass quads have their own copy() method.
|
| ASSERT(material() != RenderPass);
|
| @@ -84,11 +84,11 @@ PassOwnPtr<CCDrawQuad> CCDrawQuad::copy(const CCSharedQuadState* copiedSharedQua
|
| unsigned bytes = size();
|
| ASSERT(bytes);
|
|
|
| - OwnPtr<CCDrawQuad> copyQuad(adoptPtr(reinterpret_cast<CCDrawQuad*>(new char[bytes])));
|
| + scoped_ptr<CCDrawQuad> copyQuad(reinterpret_cast<CCDrawQuad*>(new char[bytes]));
|
| memcpy(copyQuad.get(), this, bytes);
|
| copyQuad->setSharedQuadState(copiedSharedQuadState);
|
|
|
| - return copyQuad.release();
|
| + return copyQuad.Pass();
|
| }
|
|
|
| void CCDrawQuad::setSharedQuadState(const CCSharedQuadState* sharedQuadState)
|
|
|