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

Unified Diff: cc/CCDrawQuad.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/CCDrawQuad.h ('k') | cc/CCDrawQuadTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « cc/CCDrawQuad.h ('k') | cc/CCDrawQuadTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698