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

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/CCDelegatedRendererLayerImpl.cpp ('k') | cc/CCDrawQuad.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCDelegatedRendererLayerImpl.h" 7 #include "CCDelegatedRendererLayerImpl.h"
8 8
9 #include "CCAppendQuadsData.h" 9 #include "CCAppendQuadsData.h"
10 #include "CCGeometryTestUtils.h" 10 #include "CCGeometryTestUtils.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 CCTestRenderPass* testPass = static_cast<CCTestRenderPass*>(pass.get()); 71 CCTestRenderPass* testPass = static_cast<CCTestRenderPass*>(pass.get());
72 passList.append(pass.Pass()); 72 passList.append(pass.Pass());
73 return testPass; 73 return testPass;
74 } 74 }
75 75
76 static CCSolidColorDrawQuad* addQuad(CCTestRenderPass* pass, IntRect rect, SkCol or color) 76 static CCSolidColorDrawQuad* addQuad(CCTestRenderPass* pass, IntRect rect, SkCol or color)
77 { 77 {
78 MockCCQuadCuller quadSink(pass->quadList(), pass->sharedQuadStateList()); 78 MockCCQuadCuller quadSink(pass->quadList(), pass->sharedQuadStateList());
79 CCAppendQuadsData data(pass->id()); 79 CCAppendQuadsData data(pass->id());
80 CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadSta te::create(WebTransformationMatrix(), rect, rect, 1, false)); 80 CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadSta te::create(WebTransformationMatrix(), rect, rect, 1, false));
81 OwnPtr<CCSolidColorDrawQuad> quad(CCSolidColorDrawQuad::create(sharedState, rect, color)); 81 scoped_ptr<CCSolidColorDrawQuad> quad = CCSolidColorDrawQuad::create(sharedS tate, rect, color);
82 CCSolidColorDrawQuad* quadPtr = quad.get(); 82 CCSolidColorDrawQuad* quadPtr = quad.get();
83 quadSink.append(quad.release(), data); 83 quadSink.append(quad.PassAs<CCDrawQuad>(), data);
84 return quadPtr; 84 return quadPtr;
85 } 85 }
86 86
87 static void addRenderPassQuad(CCTestRenderPass* toPass, CCTestRenderPass* contri butingPass) 87 static void addRenderPassQuad(CCTestRenderPass* toPass, CCTestRenderPass* contri butingPass)
88 { 88 {
89 MockCCQuadCuller quadSink(toPass->quadList(), toPass->sharedQuadStateList()) ; 89 MockCCQuadCuller quadSink(toPass->quadList(), toPass->sharedQuadStateList()) ;
90 CCAppendQuadsData data(toPass->id()); 90 CCAppendQuadsData data(toPass->id());
91 IntRect outputRect = contributingPass->outputRect(); 91 IntRect outputRect = contributingPass->outputRect();
92 CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadSta te::create(WebTransformationMatrix(), outputRect, outputRect, 1, false)); 92 CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadSta te::create(WebTransformationMatrix(), outputRect, outputRect, 1, false));
93 OwnPtr<CCRenderPassDrawQuad> quad(CCRenderPassDrawQuad::create(sharedState, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0)); 93 scoped_ptr<CCRenderPassDrawQuad> quad = CCRenderPassDrawQuad::create(sharedS tate, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0);
94 quadSink.append(quad.release(), data); 94 quadSink.append(quad.PassAs<CCDrawQuad>(), data);
95 } 95 }
96 96
97 class CCDelegatedRendererLayerImplTestSimple : public CCDelegatedRendererLayerIm plTest { 97 class CCDelegatedRendererLayerImplTestSimple : public CCDelegatedRendererLayerIm plTest {
98 public: 98 public:
99 CCDelegatedRendererLayerImplTestSimple() 99 CCDelegatedRendererLayerImplTestSimple()
100 : CCDelegatedRendererLayerImplTest() 100 : CCDelegatedRendererLayerImplTest()
101 { 101 {
102 OwnPtr<CCSolidColorLayerImpl> rootLayer = CCSolidColorLayerImpl::create( 1); 102 OwnPtr<CCSolidColorLayerImpl> rootLayer = CCSolidColorLayerImpl::create( 1);
103 OwnPtr<CCSolidColorLayerImpl> layerBefore = CCSolidColorLayerImpl::creat e(2); 103 OwnPtr<CCSolidColorLayerImpl> layerBefore = CCSolidColorLayerImpl::creat e(2);
104 OwnPtr<CCSolidColorLayerImpl> layerAfter = CCSolidColorLayerImpl::create (3); 104 OwnPtr<CCSolidColorLayerImpl> layerAfter = CCSolidColorLayerImpl::create (3);
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 371
372 // Quads from non-root RenderPasses should not be shifted though. 372 // Quads from non-root RenderPasses should not be shifted though.
373 ASSERT_EQ(2u, frame.renderPasses[2]->quadList().size()); 373 ASSERT_EQ(2u, frame.renderPasses[2]->quadList().size());
374 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[2]->quadList()[0]->quadTransform()); 374 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[2]->quadList()[0]->quadTransform());
375 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[2]->quadList()[1]->quadTransform()); 375 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[2]->quadList()[1]->quadTransform());
376 ASSERT_EQ(1u, frame.renderPasses[1]->quadList().size()); 376 ASSERT_EQ(1u, frame.renderPasses[1]->quadList().size());
377 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[1]->quadList()[0]->quadTransform()); 377 EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasse s[1]->quadList()[0]->quadTransform());
378 } 378 }
379 379
380 } // namespace 380 } // namespace
OLDNEW
« 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