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

Unified Diff: cc/CCSharedQuadState.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/CCSharedQuadState.h ('k') | cc/CCSolidColorDrawQuad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCSharedQuadState.cpp
diff --git a/cc/CCSharedQuadState.cpp b/cc/CCSharedQuadState.cpp
index 65fe2f0ff29cc8c14e1a516cf7309920440b35e6..7aca0eccb7edaf376a67682fa7e24574e70f04f5 100644
--- a/cc/CCSharedQuadState.cpp
+++ b/cc/CCSharedQuadState.cpp
@@ -10,9 +10,9 @@
namespace cc {
-PassOwnPtr<CCSharedQuadState> CCSharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
+scoped_ptr<CCSharedQuadState> CCSharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
{
- return adoptPtr(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
+ return scoped_ptr<CCSharedQuadState>(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
}
CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
@@ -25,11 +25,11 @@ CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quad
{
}
-PassOwnPtr<CCSharedQuadState> CCSharedQuadState::copy() const
+scoped_ptr<CCSharedQuadState> CCSharedQuadState::copy() const
{
- OwnPtr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
+ scoped_ptr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
copiedState->id = id;
- return copiedState.release();
+ return copiedState.Pass();
}
}
« no previous file with comments | « cc/CCSharedQuadState.h ('k') | cc/CCSolidColorDrawQuad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698