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/layer_iterator_unittest.cc

Issue 10915313: cc: Apply the layer's initial CSS scale to the contentsScale to render text at the right resolution. (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/layer.cc ('k') | cc/layer_tree_host.cc » ('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 "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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 scoped_refptr<TestLayerChromium> fourth = TestLayerChromium::create(); 123 scoped_refptr<TestLayerChromium> fourth = TestLayerChromium::create();
124 124
125 rootLayer->createRenderSurface(); 125 rootLayer->createRenderSurface();
126 126
127 rootLayer->addChild(first); 127 rootLayer->addChild(first);
128 rootLayer->addChild(second); 128 rootLayer->addChild(second);
129 rootLayer->addChild(third); 129 rootLayer->addChild(third);
130 rootLayer->addChild(fourth); 130 rootLayer->addChild(fourth);
131 131
132 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList; 132 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList;
133 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 133 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 1, 256, renderSurfaceLayerList);
134 134
135 iterateBackToFront(&renderSurfaceLayerList); 135 iterateBackToFront(&renderSurfaceLayerList);
136 EXPECT_COUNT(rootLayer, 0, -1, 1); 136 EXPECT_COUNT(rootLayer, 0, -1, 1);
137 EXPECT_COUNT(first, -1, -1, 2); 137 EXPECT_COUNT(first, -1, -1, 2);
138 EXPECT_COUNT(second, -1, -1, 3); 138 EXPECT_COUNT(second, -1, -1, 3);
139 EXPECT_COUNT(third, -1, -1, 4); 139 EXPECT_COUNT(third, -1, -1, 4);
140 EXPECT_COUNT(fourth, -1, -1, 5); 140 EXPECT_COUNT(fourth, -1, -1, 5);
141 141
142 iterateFrontToBack(&renderSurfaceLayerList); 142 iterateFrontToBack(&renderSurfaceLayerList);
143 EXPECT_COUNT(rootLayer, 5, -1, 4); 143 EXPECT_COUNT(rootLayer, 5, -1, 4);
(...skipping 21 matching lines...) Expand all
165 rootLayer->addChild(root1); 165 rootLayer->addChild(root1);
166 rootLayer->addChild(root2); 166 rootLayer->addChild(root2);
167 rootLayer->addChild(root3); 167 rootLayer->addChild(root3);
168 root2->addChild(root21); 168 root2->addChild(root21);
169 root2->addChild(root22); 169 root2->addChild(root22);
170 root2->addChild(root23); 170 root2->addChild(root23);
171 root22->addChild(root221); 171 root22->addChild(root221);
172 root23->addChild(root231); 172 root23->addChild(root231);
173 173
174 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList; 174 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList;
175 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 175 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 1, 256, renderSurfaceLayerList);
176 176
177 iterateBackToFront(&renderSurfaceLayerList); 177 iterateBackToFront(&renderSurfaceLayerList);
178 EXPECT_COUNT(rootLayer, 0, -1, 1); 178 EXPECT_COUNT(rootLayer, 0, -1, 1);
179 EXPECT_COUNT(root1, -1, -1, 2); 179 EXPECT_COUNT(root1, -1, -1, 2);
180 EXPECT_COUNT(root2, -1, -1, 3); 180 EXPECT_COUNT(root2, -1, -1, 3);
181 EXPECT_COUNT(root21, -1, -1, 4); 181 EXPECT_COUNT(root21, -1, -1, 4);
182 EXPECT_COUNT(root22, -1, -1, 5); 182 EXPECT_COUNT(root22, -1, -1, 5);
183 EXPECT_COUNT(root221, -1, -1, 6); 183 EXPECT_COUNT(root221, -1, -1, 6);
184 EXPECT_COUNT(root23, -1, -1, 7); 184 EXPECT_COUNT(root23, -1, -1, 7);
185 EXPECT_COUNT(root231, -1, -1, 8); 185 EXPECT_COUNT(root231, -1, -1, 8);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 root2->setOpacity(0.5); // Force the layer to own a new surface. 220 root2->setOpacity(0.5); // Force the layer to own a new surface.
221 root2->addChild(root21); 221 root2->addChild(root21);
222 root2->addChild(root22); 222 root2->addChild(root22);
223 root2->addChild(root23); 223 root2->addChild(root23);
224 root22->setOpacity(0.5); 224 root22->setOpacity(0.5);
225 root22->addChild(root221); 225 root22->addChild(root221);
226 root23->setOpacity(0.5); 226 root23->setOpacity(0.5);
227 root23->addChild(root231); 227 root23->addChild(root231);
228 228
229 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList; 229 std::vector<scoped_refptr<LayerChromium> > renderSurfaceLayerList;
230 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 230 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 1, 256, renderSurfaceLayerList);
231 231
232 iterateBackToFront(&renderSurfaceLayerList); 232 iterateBackToFront(&renderSurfaceLayerList);
233 EXPECT_COUNT(rootLayer, 0, -1, 1); 233 EXPECT_COUNT(rootLayer, 0, -1, 1);
234 EXPECT_COUNT(root1, -1, -1, 2); 234 EXPECT_COUNT(root1, -1, -1, 2);
235 EXPECT_COUNT(root2, 4, 3, -1); 235 EXPECT_COUNT(root2, 4, 3, -1);
236 EXPECT_COUNT(root21, -1, -1, 5); 236 EXPECT_COUNT(root21, -1, -1, 5);
237 EXPECT_COUNT(root22, 7, 6, 8); 237 EXPECT_COUNT(root22, 7, 6, 8);
238 EXPECT_COUNT(root221, -1, -1, 9); 238 EXPECT_COUNT(root221, -1, -1, 9);
239 EXPECT_COUNT(root23, 11, 10, 12); 239 EXPECT_COUNT(root23, 11, 10, 12);
240 EXPECT_COUNT(root231, -1, -1, 13); 240 EXPECT_COUNT(root231, -1, -1, 13);
241 EXPECT_COUNT(root3, -1, -1, 14); 241 EXPECT_COUNT(root3, -1, -1, 14);
242 242
243 iterateFrontToBack(&renderSurfaceLayerList); 243 iterateFrontToBack(&renderSurfaceLayerList);
244 EXPECT_COUNT(rootLayer, 14, -1, 13); 244 EXPECT_COUNT(rootLayer, 14, -1, 13);
245 EXPECT_COUNT(root1, -1, -1, 12); 245 EXPECT_COUNT(root1, -1, -1, 12);
246 EXPECT_COUNT(root2, 10, 11, -1); 246 EXPECT_COUNT(root2, 10, 11, -1);
247 EXPECT_COUNT(root21, -1, -1, 9); 247 EXPECT_COUNT(root21, -1, -1, 9);
248 EXPECT_COUNT(root22, 7, 8, 6); 248 EXPECT_COUNT(root22, 7, 8, 6);
249 EXPECT_COUNT(root221, -1, -1, 5); 249 EXPECT_COUNT(root221, -1, -1, 5);
250 EXPECT_COUNT(root23, 3, 4, 2); 250 EXPECT_COUNT(root23, 3, 4, 2);
251 EXPECT_COUNT(root231, -1, -1, 1); 251 EXPECT_COUNT(root231, -1, -1, 1);
252 EXPECT_COUNT(root3, -1, -1, 0); 252 EXPECT_COUNT(root3, -1, -1, 0);
253 } 253 }
254 254
255 } // namespace 255 } // namespace
OLDNEW
« no previous file with comments | « cc/layer.cc ('k') | cc/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698