diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:44:34 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:44:34 +0000 |
| commit | a7cb3b39e90b34992c3132e63d35d5b1fb17e283 (patch) | |
| tree | c05372419431e0072faf5edff9070eee304e9649 /cc/CCRenderPass.cpp | |
| parent | 60ae4c071a676a1b0ef138eb38664874730201b6 (diff) | |
| download | chromium_src-a7cb3b39e90b34992c3132e63d35d5b1fb17e283.zip chromium_src-a7cb3b39e90b34992c3132e63d35d5b1fb17e283.tar.gz chromium_src-a7cb3b39e90b34992c3132e63d35d5b1fb17e283.tar.bz2 | |
Revert 158729 - Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass
We add a ScopedPtrHashMap and ScopedPtrVector which preserve the behaviour
of HashMap<T, OwnPtr<V> > and Vector<OwnPtr<T>> and use these for CCRenderPass
and any code that creates CCRenderPass objects.
R=enne,jamesr
BUG=152049
Review URL: https://chromiumcodereview.appspot.com/10979010
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/10984036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCRenderPass.cpp')
| -rw-r--r-- | cc/CCRenderPass.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/CCRenderPass.cpp b/cc/CCRenderPass.cpp index acc6483..3d67843 100644 --- a/cc/CCRenderPass.cpp +++ b/cc/CCRenderPass.cpp @@ -17,9 +17,9 @@ using WebKit::WebTransformationMatrix; namespace cc { -scoped_ptr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget) +PassOwnPtr<CCRenderPass> CCRenderPass::create(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget) { - return scoped_ptr<CCRenderPass>(new CCRenderPass(id, outputRect, transformToRootTarget)); + return adoptPtr(new CCRenderPass(id, outputRect, transformToRootTarget)); } CCRenderPass::CCRenderPass(Id id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget) @@ -37,17 +37,17 @@ CCRenderPass::~CCRenderPass() { } -scoped_ptr<CCRenderPass> CCRenderPass::copy(Id newId) const +PassOwnPtr<CCRenderPass> CCRenderPass::copy(Id newId) const { ASSERT(newId != m_id); - scoped_ptr<CCRenderPass> copyPass(create(newId, m_outputRect, m_transformToRootTarget)); + OwnPtr<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.Pass(); + return copyPass.release(); } void CCRenderPass::appendQuadsForLayer(CCLayerImpl* layer, CCOcclusionTrackerImpl* occlusionTracker, CCAppendQuadsData& appendQuadsData) |