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

Side by Side Diff: cc/CCRendererSoftwareTest.cpp

Issue 10989028: cc: Remove WebCore dependecies from CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 "CCRendererSoftware.h" 7 #include "CCRendererSoftware.h"
8 8
9 #include "CCAnimationTestCommon.h" 9 #include "CCAnimationTestCommon.h"
10 #include "CCGeometryTestUtils.h" 10 #include "CCGeometryTestUtils.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1); 77 CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1);
78 scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRende rPassId, outerRect, WebTransformationMatrix()); 78 scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRende rPassId, outerRect, WebTransformationMatrix());
79 CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRender Pass.get()); 79 CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRender Pass.get());
80 scoped_ptr<CCDrawQuad> outerQuad = CCSolidColorDrawQuad::create(sharedQuadSt ate.get(), outerRect, SK_ColorYELLOW).PassAs<CCDrawQuad>(); 80 scoped_ptr<CCDrawQuad> outerQuad = CCSolidColorDrawQuad::create(sharedQuadSt ate.get(), outerRect, SK_ColorYELLOW).PassAs<CCDrawQuad>();
81 scoped_ptr<CCDrawQuad> innerQuad = CCSolidColorDrawQuad::create(sharedQuadSt ate.get(), innerRect, SK_ColorCYAN).PassAs<CCDrawQuad>(); 81 scoped_ptr<CCDrawQuad> innerQuad = CCSolidColorDrawQuad::create(sharedQuadSt ate.get(), innerRect, SK_ColorCYAN).PassAs<CCDrawQuad>();
82 testRenderPass->appendQuad(innerQuad.Pass()); 82 testRenderPass->appendQuad(innerQuad.Pass());
83 testRenderPass->appendQuad(outerQuad.Pass()); 83 testRenderPass->appendQuad(outerQuad.Pass());
84 84
85 CCRenderPassList list; 85 CCRenderPassList list;
86 CCRenderPassIdHashMap hashmap; 86 CCRenderPassIdHashMap hashmap;
87 list.append(rootRenderPass.get()); 87 list.push_back(rootRenderPass.get());
88 hashmap.add(rootRenderPassId, rootRenderPass.Pass()); 88 hashmap.add(rootRenderPassId, rootRenderPass.Pass());
89 renderer()->drawFrame(list, hashmap); 89 renderer()->drawFrame(list, hashmap);
90 90
91 OwnArrayPtr<SkColor> pixels = adoptArrayPtr(new SkColor[deviceViewportSize() .width() * deviceViewportSize().height()]); 91 OwnArrayPtr<SkColor> pixels = adoptArrayPtr(new SkColor[deviceViewportSize() .width() * deviceViewportSize().height()]);
92 renderer()->getFramebufferPixels(pixels.get(), outerRect); 92 renderer()->getFramebufferPixels(pixels.get(), outerRect);
93 93
94 EXPECT_EQ(SK_ColorYELLOW, pixels[0]); 94 EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
95 EXPECT_EQ(SK_ColorYELLOW, pixels[outerPixels - 1]); 95 EXPECT_EQ(SK_ColorYELLOW, pixels[outerPixels - 1]);
96 EXPECT_EQ(SK_ColorCYAN, pixels[outerSize.width() + 1]); 96 EXPECT_EQ(SK_ColorCYAN, pixels[outerSize.width() + 1]);
97 EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]); 97 EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1); 129 CCRenderPass::Id rootRenderPassId = CCRenderPass::Id(1, 1);
130 scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRende rPassId, IntRect(IntPoint(), deviceViewportSize()), WebTransformationMatrix()); 130 scoped_ptr<CCRenderPass> rootRenderPass = CCTestRenderPass::create(rootRende rPassId, IntRect(IntPoint(), deviceViewportSize()), WebTransformationMatrix());
131 CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRender Pass.get()); 131 CCTestRenderPass* testRenderPass = static_cast<CCTestRenderPass*>(rootRender Pass.get());
132 scoped_ptr<CCDrawQuad> outerQuad = CCTileDrawQuad::create(sharedQuadState.ge t(), outerRect, outerRect, resourceYellow, IntPoint(), outerSize, 0, false, fals e, false, false, false).PassAs<CCDrawQuad>(); 132 scoped_ptr<CCDrawQuad> outerQuad = CCTileDrawQuad::create(sharedQuadState.ge t(), outerRect, outerRect, resourceYellow, IntPoint(), outerSize, 0, false, fals e, false, false, false).PassAs<CCDrawQuad>();
133 scoped_ptr<CCDrawQuad> innerQuad = CCTileDrawQuad::create(sharedQuadState.ge t(), innerRect, innerRect, resourceCyan, IntPoint(), innerSize, 0, false, false, false, false, false).PassAs<CCDrawQuad>(); 133 scoped_ptr<CCDrawQuad> innerQuad = CCTileDrawQuad::create(sharedQuadState.ge t(), innerRect, innerRect, resourceCyan, IntPoint(), innerSize, 0, false, false, false, false, false).PassAs<CCDrawQuad>();
134 testRenderPass->appendQuad(innerQuad.Pass()); 134 testRenderPass->appendQuad(innerQuad.Pass());
135 testRenderPass->appendQuad(outerQuad.Pass()); 135 testRenderPass->appendQuad(outerQuad.Pass());
136 136
137 CCRenderPassList list; 137 CCRenderPassList list;
138 CCRenderPassIdHashMap hashmap; 138 CCRenderPassIdHashMap hashmap;
139 list.append(rootRenderPass.get()); 139 list.push_back(rootRenderPass.get());
140 hashmap.add(rootRenderPassId, rootRenderPass.Pass()); 140 hashmap.add(rootRenderPassId, rootRenderPass.Pass());
141 renderer()->drawFrame(list, hashmap); 141 renderer()->drawFrame(list, hashmap);
142 142
143 OwnArrayPtr<SkColor> pixels = adoptArrayPtr(new SkColor[deviceViewportSize() .width() * deviceViewportSize().height()]); 143 OwnArrayPtr<SkColor> pixels = adoptArrayPtr(new SkColor[deviceViewportSize() .width() * deviceViewportSize().height()]);
144 renderer()->getFramebufferPixels(pixels.get(), outerRect); 144 renderer()->getFramebufferPixels(pixels.get(), outerRect);
145 145
146 EXPECT_EQ(SK_ColorYELLOW, pixels[0]); 146 EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
147 EXPECT_EQ(SK_ColorYELLOW, pixels[outerPixels - 1]); 147 EXPECT_EQ(SK_ColorYELLOW, pixels[outerPixels - 1]);
148 EXPECT_EQ(SK_ColorCYAN, pixels[outerSize.width() + 1]); 148 EXPECT_EQ(SK_ColorCYAN, pixels[outerSize.width() + 1]);
149 EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]); 149 EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]);
150 } 150 }
151 151
152 } // namespace 152 } // namespace
OLDNEW
« no previous file with comments | « cc/CCRendererSoftware.cpp ('k') | cc/CCSharedQuadState.h » ('j') | cc/scoped_ptr_hash_map.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698