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

Unified Diff: cc/CCRenderPass.cpp

Issue 10979010: Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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.h ('k') | cc/CCRenderPassSink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRenderPass.cpp
diff --git a/cc/CCRenderPass.cpp b/cc/CCRenderPass.cpp
index 3d678433c80561070d941a94fb0d2fe10ad2fb00..acc6483f2e44dfa4980d7737fa645127f2d8a0a8 100644
--- a/cc/CCRenderPass.cpp
+++ b/cc/CCRenderPass.cpp
@@ -17,9 +17,9 @@ using WebKit::WebTransformationMatrix;
namespace cc {
-PassOwnPtr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
+scoped_ptr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
{
- return adoptPtr(new CCRenderPass(id, outputRect, transformToRootTarget));
+ return scoped_ptr<CCRenderPass>(new CCRenderPass(id, outputRect, transformToRootTarget));
}
CCRenderPass::CCRenderPass(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget)
@@ -37,17 +37,17 @@ CCRenderPass::~CCRenderPass()
{
}
-PassOwnPtr<CCRenderPass> CCRenderPass::copy(Id newId) const
+scoped_ptr<CCRenderPass> CCRenderPass::copy(Id newId) const
{
ASSERT(newId != m_id);
- OwnPtr<CCRenderPass> copyPass(create(newId, m_outputRect, m_transformToRootTarget));
+ scoped_ptr<CCRenderPass> copyPass(create(newId, m_outputRect, m_transformToRootTarget));
copyPass->setDamageRect(m_damageRect);
copyPass->setHasTransparentBackground(m_hasTransparentBackground);
copyPass->setHasOcclusionFromOutsideTargetSurface(m_hasOcclusionFromOutsideTargetSurface);
copyPass->setFilters(m_filters);
copyPass->setBackgroundFilters(m_backgroundFilters);
- return copyPass.release();
+ return copyPass.Pass();
}
void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData)
« no previous file with comments | « cc/CCRenderPass.h ('k') | cc/CCRenderPassSink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698