| Index: cc/test/MockCCQuadCuller.cpp
|
| diff --git a/cc/test/MockCCQuadCuller.cpp b/cc/test/MockCCQuadCuller.cpp
|
| index 5d01c96e8287185983050b3e17b33a1426a3447e..96cd2068e58439aac519cd602efb91fcb6ffdd48 100644
|
| --- a/cc/test/MockCCQuadCuller.cpp
|
| +++ b/cc/test/MockCCQuadCuller.cpp
|
| @@ -24,23 +24,21 @@ MockCCQuadCuller::~MockCCQuadCuller()
|
| {
|
| }
|
|
|
| -bool MockCCQuadCuller::append(PassOwnPtr<CCDrawQuad> newQuad, CCAppendQuadsData&)
|
| +bool MockCCQuadCuller::append(scoped_ptr<CCDrawQuad> drawQuad, CCAppendQuadsData&)
|
| {
|
| - OwnPtr<CCDrawQuad> drawQuad = newQuad;
|
| if (!drawQuad->quadRect().isEmpty()) {
|
| - m_activeQuadList.append(drawQuad.release());
|
| + m_activeQuadList.append(drawQuad.Pass());
|
| return true;
|
| }
|
| return false;
|
| }
|
|
|
| -CCSharedQuadState* MockCCQuadCuller::useSharedQuadState(PassOwnPtr<CCSharedQuadState> passSharedQuadState)
|
| +CCSharedQuadState* MockCCQuadCuller::useSharedQuadState(scoped_ptr<CCSharedQuadState> sharedQuadState)
|
| {
|
| - OwnPtr<CCSharedQuadState> sharedQuadState(passSharedQuadState);
|
| sharedQuadState->id = m_activeSharedQuadStateList.size();
|
|
|
| CCSharedQuadState* rawPtr = sharedQuadState.get();
|
| - m_activeSharedQuadStateList.append(sharedQuadState.release());
|
| + m_activeSharedQuadStateList.append(sharedQuadState.Pass());
|
| return rawPtr;
|
| }
|
|
|
|
|