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

Side by Side Diff: cc/damage_tracker_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests Created 8 years, 1 month 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "CCDamageTracker.h" 7 #include "CCDamageTracker.h"
8 8
9 #include "cc/layer_impl.h" 9 #include "cc/layer_impl.h"
10 #include "cc/layer_sorter.h" 10 #include "cc/layer_sorter.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 scoped_ptr<LayerImpl> root = createTestTreeWithTwoSurfaces(); 158 scoped_ptr<LayerImpl> root = createTestTreeWithTwoSurfaces();
159 159
160 // Setup includes going past the first frame which always damages everything , so 160 // Setup includes going past the first frame which always damages everything , so
161 // that we can actually perform specific tests. 161 // that we can actually perform specific tests.
162 emulateDrawingOneFrame(root.get()); 162 emulateDrawingOneFrame(root.get());
163 163
164 return root.Pass(); 164 return root.Pass();
165 } 165 }
166 166
167 class DamageTrackerTest : public testing::Test { 167 class DamageTrackerTest : public testing::Test {
168 private:
169 // For testing purposes, fake that we are on the impl thread.
170 DebugScopedSetImplThread setImplThread;
171 }; 168 };
172 169
173 TEST_F(DamageTrackerTest, sanityCheckTestTreeWithOneSurface) 170 TEST_F(DamageTrackerTest, sanityCheckTestTreeWithOneSurface)
174 { 171 {
175 // Sanity check that the simple test tree will actually produce the expected render 172 // Sanity check that the simple test tree will actually produce the expected render
176 // surfaces and layer lists. 173 // surfaces and layer lists.
177 174
178 scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface(); 175 scoped_ptr<LayerImpl> root = createAndSetUpTestTreeWithOneSurface();
179 176
180 EXPECT_EQ(2u, root->renderSurface()->layerList().size()); 177 EXPECT_EQ(2u, root->renderSurface()->layerList().size());
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect() ; 1156 rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect() ;
1160 EXPECT_TRUE(rootDamageRect.isEmpty()); 1157 EXPECT_TRUE(rootDamageRect.isEmpty());
1161 1158
1162 // Damage should remain empty even after one frame, since there's yet no new damage 1159 // Damage should remain empty even after one frame, since there's yet no new damage
1163 emulateDrawingOneFrame(root.get()); 1160 emulateDrawingOneFrame(root.get());
1164 rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect() ; 1161 rootDamageRect = root->renderSurface()->damageTracker()->currentDamageRect() ;
1165 EXPECT_TRUE(rootDamageRect.isEmpty()); 1162 EXPECT_TRUE(rootDamageRect.isEmpty());
1166 } 1163 }
1167 1164
1168 } // namespace 1165 } // namespace
OLDNEW
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/delegated_renderer_layer_impl_unittest.cc » ('j') | cc/gl_renderer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698