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

Unified Diff: cc/CCRenderPassDrawQuad.h

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/CCRenderPass.cpp ('k') | cc/CCRenderPassDrawQuad.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRenderPassDrawQuad.h
diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
index 0bffc351cbc1a82bd3bfdc51e0a9bde45905afa4..67088925d7edcc1d8a3d178ffab7cf03efc71bc7 100644
--- a/cc/CCRenderPassDrawQuad.h
+++ b/cc/CCRenderPassDrawQuad.h
@@ -9,14 +9,14 @@
#include "CCRenderPass.h"
#include "CCResourceProvider.h"
#include "IntRect.h"
-#include <wtf/PassOwnPtr.h>
+#include "base/memory/scoped_ptr.h"
namespace cc {
class CCRenderPassDrawQuad : public CCDrawQuad {
WTF_MAKE_NONCOPYABLE(CCRenderPassDrawQuad);
public:
- static PassOwnPtr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
+ static scoped_ptr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
CCRenderPass::Id renderPassId() const { return m_renderPassId; }
bool isReplica() const { return m_isReplica; }
@@ -29,7 +29,7 @@ public:
float maskTexCoordOffsetX() const { return m_maskTexCoordOffsetX; }
float maskTexCoordOffsetY() const { return m_maskTexCoordOffsetY; }
- PassOwnPtr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
+ scoped_ptr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
private:
CCRenderPassDrawQuad(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
« no previous file with comments | « cc/CCRenderPass.cpp ('k') | cc/CCRenderPassDrawQuad.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698