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

Side by Side Diff: cc/resources/picture_layer_tiling_set_unittest.cc

Issue 366113002: cc: Do not cleanup tiles with raster tasks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits updated. Created 6 years, 4 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
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 "cc/resources/picture_layer_tiling_set.h" 5 #include "cc/resources/picture_layer_tiling_set.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "cc/resources/resource_pool.h" 10 #include "cc/resources/resource_pool.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 FakeOutputSurface::Create3d(); 66 FakeOutputSurface::Create3d();
67 CHECK(output_surface->BindToClient(&output_surface_client)); 67 CHECK(output_surface->BindToClient(&output_surface_client));
68 68
69 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( 69 scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
70 new TestSharedBitmapManager()); 70 new TestSharedBitmapManager());
71 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create( 71 scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
72 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false); 72 output_surface.get(), shared_bitmap_manager.get(), 0, false, 1, false);
73 73
74 FakePictureLayerTilingClient client(resource_provider.get()); 74 FakePictureLayerTilingClient client(resource_provider.get());
75 client.SetTileSize(gfx::Size(256, 256)); 75 client.SetTileSize(gfx::Size(256, 256));
76 client.set_tree(PENDING_TREE);
76 gfx::Size layer_bounds(1000, 800); 77 gfx::Size layer_bounds(1000, 800);
77 PictureLayerTilingSet set(&client, layer_bounds); 78 PictureLayerTilingSet set(&client, layer_bounds);
78 79
79 float scale = min_scale; 80 float scale = min_scale;
80 for (int i = 0; i < num_tilings; ++i, scale += scale_increment) { 81 for (int i = 0; i < num_tilings; ++i, scale += scale_increment) {
81 PictureLayerTiling* tiling = set.AddTiling(scale); 82 PictureLayerTiling* tiling = set.AddTiling(scale);
82 tiling->CreateAllTilesForTesting(); 83 tiling->CreateAllTilesForTesting();
83 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); 84 std::vector<Tile*> tiles = tiling->AllTilesForTesting();
84 client.tile_manager()->InitializeTilesWithResourcesForTesting(tiles); 85 client.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
85 } 86 }
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 runTest(10, 1.f, 1.f, 4.5f, 5.f); 147 runTest(10, 1.f, 1.f, 4.5f, 5.f);
147 } 148 }
148 149
149 class PictureLayerTilingSetSyncTest : public testing::Test { 150 class PictureLayerTilingSetSyncTest : public testing::Test {
150 public: 151 public:
151 PictureLayerTilingSetSyncTest() 152 PictureLayerTilingSetSyncTest()
152 : tile_size_(gfx::Size(10, 10)), 153 : tile_size_(gfx::Size(10, 10)),
153 source_bounds_(gfx::Size(30, 20)), 154 source_bounds_(gfx::Size(30, 20)),
154 target_bounds_(gfx::Size(30, 30)) { 155 target_bounds_(gfx::Size(30, 30)) {
155 source_client_.SetTileSize(tile_size_); 156 source_client_.SetTileSize(tile_size_);
157 source_client_.set_tree(PENDING_TREE);
156 target_client_.SetTileSize(tile_size_); 158 target_client_.SetTileSize(tile_size_);
159 target_client_.set_tree(PENDING_TREE);
157 source_.reset(new PictureLayerTilingSet(&source_client_, source_bounds_)); 160 source_.reset(new PictureLayerTilingSet(&source_client_, source_bounds_));
158 target_.reset(new PictureLayerTilingSet(&target_client_, target_bounds_)); 161 target_.reset(new PictureLayerTilingSet(&target_client_, target_bounds_));
159 } 162 }
160 163
161 // Sync from source to target. 164 // Sync from source to target.
162 void SyncTilings(const gfx::Size& new_bounds, 165 void SyncTilings(const gfx::Size& new_bounds,
163 const Region& invalidation, 166 const Region& invalidation,
164 float minimum_scale) { 167 float minimum_scale) {
165 for (size_t i = 0; i < source_->num_tilings(); ++i) 168 for (size_t i = 0; i < source_->num_tilings(); ++i)
166 source_->tiling_at(i)->CreateAllTilesForTesting(); 169 source_->tiling_at(i)->CreateAllTilesForTesting();
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting(); 417 std::vector<Tile*> new_tiles = target_->tiling_at(0)->AllTilesForTesting();
415 for (size_t i = 0; i < original_tiles.size(); ++i) { 418 for (size_t i = 0; i < original_tiles.size(); ++i) {
416 std::vector<Tile*>::iterator find = 419 std::vector<Tile*>::iterator find =
417 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]); 420 std::find(new_tiles.begin(), new_tiles.end(), original_tiles[i]);
418 EXPECT_TRUE(find == new_tiles.end()); 421 EXPECT_TRUE(find == new_tiles.end());
419 } 422 }
420 } 423 }
421 424
422 } // namespace 425 } // namespace
423 } // namespace cc 426 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/picture_layer_tiling_perftest.cc ('k') | cc/resources/picture_layer_tiling_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698