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

Side by Side Diff: cc/CCLayerIteratorTest.cpp

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: initialCssScale 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 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 "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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 RefPtr<TestLayerChromium> fourth = TestLayerChromium::create(); 120 RefPtr<TestLayerChromium> fourth = TestLayerChromium::create();
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, 1, 256, renderSurfaceLayerList);
131 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); 131 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList);
132 132
133 iterateBackToFront(&renderSurfaceLayerList); 133 iterateBackToFront(&renderSurfaceLayerList);
134 EXPECT_COUNT(rootLayer, 0, -1, 1); 134 EXPECT_COUNT(rootLayer, 0, -1, 1);
135 EXPECT_COUNT(first, -1, -1, 2); 135 EXPECT_COUNT(first, -1, -1, 2);
136 EXPECT_COUNT(second, -1, -1, 3); 136 EXPECT_COUNT(second, -1, -1, 3);
137 EXPECT_COUNT(third, -1, -1, 4); 137 EXPECT_COUNT(third, -1, -1, 4);
138 EXPECT_COUNT(fourth, -1, -1, 5); 138 EXPECT_COUNT(fourth, -1, -1, 5);
139 139
140 iterateFrontToBack(&renderSurfaceLayerList); 140 iterateFrontToBack(&renderSurfaceLayerList);
(...skipping 22 matching lines...) Expand all
163 rootLayer->addChild(root1); 163 rootLayer->addChild(root1);
164 rootLayer->addChild(root2); 164 rootLayer->addChild(root2);
165 rootLayer->addChild(root3); 165 rootLayer->addChild(root3);
166 root2->addChild(root21); 166 root2->addChild(root21);
167 root2->addChild(root22); 167 root2->addChild(root22);
168 root2->addChild(root23); 168 root2->addChild(root23);
169 root22->addChild(root221); 169 root22->addChild(root221);
170 root23->addChild(root231); 170 root23->addChild(root231);
171 171
172 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; 172 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
173 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 173 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 1, 256, renderSurfaceLayerList);
174 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); 174 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList);
175 175
176 iterateBackToFront(&renderSurfaceLayerList); 176 iterateBackToFront(&renderSurfaceLayerList);
177 EXPECT_COUNT(rootLayer, 0, -1, 1); 177 EXPECT_COUNT(rootLayer, 0, -1, 1);
178 EXPECT_COUNT(root1, -1, -1, 2); 178 EXPECT_COUNT(root1, -1, -1, 2);
179 EXPECT_COUNT(root2, -1, -1, 3); 179 EXPECT_COUNT(root2, -1, -1, 3);
180 EXPECT_COUNT(root21, -1, -1, 4); 180 EXPECT_COUNT(root21, -1, -1, 4);
181 EXPECT_COUNT(root22, -1, -1, 5); 181 EXPECT_COUNT(root22, -1, -1, 5);
182 EXPECT_COUNT(root221, -1, -1, 6); 182 EXPECT_COUNT(root221, -1, -1, 6);
183 EXPECT_COUNT(root23, -1, -1, 7); 183 EXPECT_COUNT(root23, -1, -1, 7);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 root2->setOpacity(0.5); // Force the layer to own a new surface. 219 root2->setOpacity(0.5); // Force the layer to own a new surface.
220 root2->addChild(root21); 220 root2->addChild(root21);
221 root2->addChild(root22); 221 root2->addChild(root22);
222 root2->addChild(root23); 222 root2->addChild(root23);
223 root22->setOpacity(0.5); 223 root22->setOpacity(0.5);
224 root22->addChild(root221); 224 root22->addChild(root221);
225 root23->setOpacity(0.5); 225 root23->setOpacity(0.5);
226 root23->addChild(root231); 226 root23->addChild(root231);
227 227
228 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList; 228 Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
229 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 256, renderSurfaceLayerList); 229 CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->b ounds(), 1, 1, 256, renderSurfaceLayerList);
230 CCLayerTreeHostCommon::calculateVisibleRects(renderSurfaceLayerList); 230 CCLayerTreeHostCommon::calculateVisibleRects(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/CCDamageTrackerTest.cpp ('k') | cc/CCLayerTreeHost.cpp » ('j') | cc/CCLayerTreeHostCommon.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698