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