| OLD | NEW |
| 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/picture_layer_tiling_set.h" | 5 #include "cc/picture_layer_tiling_set.h" |
| 6 | 6 |
| 7 #include "cc/resource_pool.h" | 7 #include "cc/resource_pool.h" |
| 8 #include "cc/resource_provider.h" | 8 #include "cc/resource_provider.h" |
| 9 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" |
| 10 #include "cc/test/fake_picture_layer_tiling_client.h" | 10 #include "cc/test/fake_picture_layer_tiling_client.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 PictureLayerTilingSet set(&client); | 69 PictureLayerTilingSet set(&client); |
| 70 | 70 |
| 71 gfx::Size layer_bounds(1000, 800); | 71 gfx::Size layer_bounds(1000, 800); |
| 72 set.SetLayerBounds(layer_bounds); | 72 set.SetLayerBounds(layer_bounds); |
| 73 | 73 |
| 74 float scale = min_scale; | 74 float scale = min_scale; |
| 75 for (int i = 0; i < num_tilings; ++i, scale += scale_increment) { | 75 for (int i = 0; i < num_tilings; ++i, scale += scale_increment) { |
| 76 PictureLayerTiling* tiling = set.AddTiling(scale); | 76 PictureLayerTiling* tiling = set.AddTiling(scale); |
| 77 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); | 77 std::vector<Tile*> tiles = tiling->AllTilesForTesting(); |
| 78 for (size_t i = 0; i < tiles.size(); ++i) { | 78 for (size_t i = 0; i < tiles.size(); ++i) { |
| 79 EXPECT_FALSE(tiles[i]->ManagedStateForTesting().resource); | 79 EXPECT_FALSE(tiles[i]->drawing_info().GetResourceForTesting()); |
| 80 | 80 |
| 81 tiles[i]->ManagedStateForTesting().resource = | 81 tiles[i]->drawing_info().GetResourceForTesting() = |
| 82 make_scoped_ptr(new ResourcePool::Resource( | 82 make_scoped_ptr(new ResourcePool::Resource( |
| 83 resource_provider.get(), | 83 resource_provider.get(), |
| 84 gfx::Size(1, 1), | 84 gfx::Size(1, 1), |
| 85 resource_provider->best_texture_format())); | 85 resource_provider->best_texture_format())); |
| 86 } | 86 } |
| 87 } | 87 } |
| 88 | 88 |
| 89 float max_contents_scale = scale; | 89 float max_contents_scale = scale; |
| 90 gfx::Size content_bounds( | 90 gfx::Size content_bounds( |
| 91 gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, max_contents_scale))); | 91 gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, max_contents_scale))); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_Equal) { | 144 TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_Equal) { |
| 145 runTest(10, 1.f, 1.f, 5.f, 5.f); | 145 runTest(10, 1.f, 1.f, 5.f, 5.f); |
| 146 } | 146 } |
| 147 | 147 |
| 148 TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_NotEqual) { | 148 TEST_F(PictureLayerTilingSetTestWithResources, ManyTilings_NotEqual) { |
| 149 runTest(10, 1.f, 1.f, 4.5f, 5.f); | 149 runTest(10, 1.f, 1.f, 4.5f, 5.f); |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace | 152 } // namespace |
| 153 } // namespace cc | 153 } // namespace cc |
| OLD | NEW |