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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: cc/CCLayerIteratorTest.cpp

Issue 11079012: Refactor CCLayerTreeHostCommon - merge visible rect computation into calc draw transforms. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Same patch without renaming calculateVisibleRect() 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
« no previous file with comments | « cc/CCDamageTrackerTest.cpp ('k') | cc/CCLayerTreeHost.cpp » ('j') | cc/CCLayerTreeHostCommon.cpp » ('J')
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 "CCLayerIterator.h" 7 #include "CCLayerIterator.h"
8 8
9 #include "CCLayerTreeHostCommon.h" 9 #include "CCLayerTreeHostCommon.h"
10 #include "LayerChromium.h" 10 #include "LayerChromium.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 rootLayer->createRenderSurface(); 122 rootLayer->createRenderSurface();
123 123
124 rootLayer->addChild(first); 124 rootLayer->addChild(first);
125 rootLayer->addChild(second); 125 rootLayer->addChild(second);
126 rootLayer->addChild(third); 126 rootLayer->addChild(third);
127 rootLayer->addChild(fourth); 127 rootLayer->addChild(fourth);
128 128
129 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; 129 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
130 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 130 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList);
131 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList);
132 131
133 iterateBackToFront(&renderSurfaceLayerList); 132 iterateBackToFront(&renderSurfaceLayerList);
134 EXPECT_COUNT(rootLayer, 0, -1, 1); 133 EXPECT_COUNT(rootLayer, 0, -1, 1);
135 EXPECT_COUNT(first, -1, -1, 2); 134 EXPECT_COUNT(first, -1, -1, 2);
136 EXPECT_COUNT(second, -1, -1, 3); 135 EXPECT_COUNT(second, -1, -1, 3);
137 EXPECT_COUNT(third, -1, -1, 4); 136 EXPECT_COUNT(third, -1, -1, 4);
138 EXPECT_COUNT(fourth, -1, -1, 5); 137 EXPECT_COUNT(fourth, -1, -1, 5);
139 138
140 iterateFrontToBack(&renderSurfaceLayerList); 139 iterateFrontToBack(&renderSurfaceLayerList);
141 EXPECT_COUNT(rootLayer, 5, -1, 4); 140 EXPECT_COUNT(rootLayer, 5, -1, 4);
(...skipping 22 matching lines...) Expand all
164 rootLayer->addChild(root2); 163 rootLayer->addChild(root2);
165 rootLayer->addChild(root3); 164 rootLayer->addChild(root3);
166 root2->addChild(root21); 165 root2->addChild(root21);
167 root2->addChild(root22); 166 root2->addChild(root22);
168 root2->addChild(root23); 167 root2->addChild(root23);
169 root22->addChild(root221); 168 root22->addChild(root221);
170 root23->addChild(root231); 169 root23->addChild(root231);
171 170
172 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; 171 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
173 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 172 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList);
174 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList);
175 173
176 iterateBackToFront(&renderSurfaceLayerList); 174 iterateBackToFront(&renderSurfaceLayerList);
177 EXPECT_COUNT(rootLayer, 0, -1, 1); 175 EXPECT_COUNT(rootLayer, 0, -1, 1);
178 EXPECT_COUNT(root1, -1, -1, 2); 176 EXPECT_COUNT(root1, -1, -1, 2);
179 EXPECT_COUNT(root2, -1, -1, 3); 177 EXPECT_COUNT(root2, -1, -1, 3);
180 EXPECT_COUNT(root21, -1, -1, 4); 178 EXPECT_COUNT(root21, -1, -1, 4);
181 EXPECT_COUNT(root22, -1, -1, 5); 179 EXPECT_COUNT(root22, -1, -1, 5);
182 EXPECT_COUNT(root221, -1, -1, 6); 180 EXPECT_COUNT(root221, -1, -1, 6);
183 EXPECT_COUNT(root23, -1, -1, 7); 181 EXPECT_COUNT(root23, -1, -1, 7);
184 EXPECT_COUNT(root231, -1, -1, 8); 182 EXPECT_COUNT(root231, -1, -1, 8);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 root2->addChild(root21); 218 root2->addChild(root21);
221 root2->addChild(root22); 219 root2->addChild(root22);
222 root2->addChild(root23); 220 root2->addChild(root23);
223 root22->setOpacity(0.5); 221 root22->setOpacity(0.5);
224 root22->addChild(root221); 222 root22->addChild(root221);
225 root23->setOpacity(0.5); 223 root23->setOpacity(0.5);
226 root23->addChild(root231); 224 root23->addChild(root231);
227 225
228 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; 226 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
229 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 227 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList);
230 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList);
231 228
232 iterateBackToFront(&renderSurfaceLayerList); 229 iterateBackToFront(&renderSurfaceLayerList);
233 EXPECT_COUNT(rootLayer, 0, -1, 1); 230 EXPECT_COUNT(rootLayer, 0, -1, 1);
234 EXPECT_COUNT(root1, -1, -1, 2); 231 EXPECT_COUNT(root1, -1, -1, 2);
235 EXPECT_COUNT(root2, 4, 3, -1); 232 EXPECT_COUNT(root2, 4, 3, -1);
236 EXPECT_COUNT(root21, -1, -1, 5); 233 EXPECT_COUNT(root21, -1, -1, 5);
237 EXPECT_COUNT(root22, 7, 6, 8); 234 EXPECT_COUNT(root22, 7, 6, 8);
238 EXPECT_COUNT(root221, -1, -1, 9); 235 EXPECT_COUNT(root221, -1, -1, 9);
239 EXPECT_COUNT(root23, 11, 10, 12); 236 EXPECT_COUNT(root23, 11, 10, 12);
240 EXPECT_COUNT(root231, -1, -1, 13); 237 EXPECT_COUNT(root231, -1, -1, 13);
241 EXPECT_COUNT(root3, -1, -1, 14); 238 EXPECT_COUNT(root3, -1, -1, 14);
242 239
243 iterateFrontToBack(&renderSurfaceLayerList); 240 iterateFrontToBack(&renderSurfaceLayerList);
244 EXPECT_COUNT(rootLayer, 14, -1, 13); 241 EXPECT_COUNT(rootLayer, 14, -1, 13);
245 EXPECT_COUNT(root1, -1, -1, 12); 242 EXPECT_COUNT(root1, -1, -1, 12);
246 EXPECT_COUNT(root2, 10, 11, -1); 243 EXPECT_COUNT(root2, 10, 11, -1);
247 EXPECT_COUNT(root21, -1, -1, 9); 244 EXPECT_COUNT(root21, -1, -1, 9);
248 EXPECT_COUNT(root22, 7, 8, 6); 245 EXPECT_COUNT(root22, 7, 8, 6);
249 EXPECT_COUNT(root221, -1, -1, 5); 246 EXPECT_COUNT(root221, -1, -1, 5);
250 EXPECT_COUNT(root23, 3, 4, 2); 247 EXPECT_COUNT(root23, 3, 4, 2);
251 EXPECT_COUNT(root231, -1, -1, 1); 248 EXPECT_COUNT(root231, -1, -1, 1);
252 EXPECT_COUNT(root3, -1, -1, 0); 249 EXPECT_COUNT(root3, -1, -1, 0);
253 } 250 }
254 251
255 } // namespace 252 } // namespace
OLDNEW
« no previous file with comments | « cc/CCDamageTrackerTest.cpp ('k') | cc/CCLayerTreeHost.cpp » ('j') | cc/CCLayerTreeHostCommon.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698