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

Unified Diff: cc/CCDelegatedRendererLayerImplTest.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/CCDelegatedRendererLayerImpl.cpp ('k') | cc/CCDrawQuad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDelegatedRendererLayerImplTest.cpp
diff --git a/cc/CCDelegatedRendererLayerImplTest.cpp b/cc/CCDelegatedRendererLayerImplTest.cpp
index 465bcac2b59e9e0c88704d4795bbf4ec61ae9180..fe6229493e10341420c9fa2b5d86d346513197f5 100644
--- a/cc/CCDelegatedRendererLayerImplTest.cpp
+++ b/cc/CCDelegatedRendererLayerImplTest.cpp
@@ -78,9 +78,9 @@ static CCSolidColorDrawQuad* addQuad(CCTestRenderPass* pass, IntRect rect, SkCol
MockCCQuadCuller quadSink(pass->quadList(), pass->sharedQuadStateList());
CCAppendQuadsData data(pass->id());
CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadState::create(WebTransformationMatrix(), rect, rect, 1, false));
- OwnPtr<CCSolidColorDrawQuad> quad(CCSolidColorDrawQuad::create(sharedState, rect, color));
+ scoped_ptr<CCSolidColorDrawQuad> quad = CCSolidColorDrawQuad::create(sharedState, rect, color);
CCSolidColorDrawQuad* quadPtr = quad.get();
- quadSink.append(quad.release(), data);
+ quadSink.append(quad.PassAs<CCDrawQuad>(), data);
return quadPtr;
}
@@ -90,8 +90,8 @@ static void addRenderPassQuad(CCTestRenderPass* toPass, CCTestRenderPass* contri
CCAppendQuadsData data(toPass->id());
IntRect outputRect = contributingPass->outputRect();
CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadState::create(WebTransformationMatrix(), outputRect, outputRect, 1, false));
- OwnPtr<CCRenderPassDrawQuad> quad(CCRenderPassDrawQuad::create(sharedState, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0));
- quadSink.append(quad.release(), data);
+ scoped_ptr<CCRenderPassDrawQuad> quad = CCRenderPassDrawQuad::create(sharedState, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0);
+ quadSink.append(quad.PassAs<CCDrawQuad>(), data);
}
class CCDelegatedRendererLayerImplTestSimple : public CCDelegatedRendererLayerImplTest {
« no previous file with comments | « cc/CCDelegatedRendererLayerImpl.cpp ('k') | cc/CCDrawQuad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698