| Index: cc/resources/picture_layer_tiling_set_unittest.cc
|
| diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
|
| index 96129c64fe5452aa0fc260c12cd4b7e1df728868..383eb85c0b6a82700edda4ec53a6130cc415b900 100644
|
| --- a/cc/resources/picture_layer_tiling_set_unittest.cc
|
| +++ b/cc/resources/picture_layer_tiling_set_unittest.cc
|
| @@ -12,6 +12,7 @@
|
| #include "cc/test/fake_output_surface.h"
|
| #include "cc/test/fake_output_surface_client.h"
|
| #include "cc/test/fake_picture_layer_tiling_client.h"
|
| +#include "cc/test/fake_tile_manager.h"
|
| #include "cc/test/fake_tile_manager_client.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/size_conversions.h"
|
| @@ -152,10 +153,25 @@ class PictureLayerTilingSetSyncTest : public testing::Test {
|
| target_bounds_(gfx::Size(30, 30)) {
|
| source_client_.SetTileSize(tile_size_);
|
| target_client_.SetTileSize(tile_size_);
|
| +
|
| + output_surface_ = FakeOutputSurface::Create3d();
|
| + CHECK(output_surface_->BindToClient(&output_surface_client_));
|
| + resource_provider_ =
|
| + ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1);
|
| + tile_manager_ = make_scoped_ptr(
|
| + new FakeTileManager(&tile_manager_client_, resource_provider_.get()));
|
| + source_client_.set_tile_manager(tile_manager_.get());
|
| + target_client_.set_tile_manager(tile_manager_.get());
|
| +
|
| source_.reset(new PictureLayerTilingSet(&source_client_, source_bounds_));
|
| target_.reset(new PictureLayerTilingSet(&target_client_, target_bounds_));
|
| }
|
|
|
| + ~PictureLayerTilingSetSyncTest() {
|
| + tile_manager_.reset(NULL);
|
| + resource_provider_.reset(NULL);
|
| + }
|
| +
|
| // Sync from source to target.
|
| void SyncTilings(gfx::Size new_bounds,
|
| const Region& invalidation,
|
| @@ -248,6 +264,12 @@ class PictureLayerTilingSetSyncTest : public testing::Test {
|
| FakePictureLayerTilingClient target_client_;
|
| gfx::Size target_bounds_;
|
| scoped_ptr<PictureLayerTilingSet> target_;
|
| +
|
| + FakeTileManagerClient tile_manager_client_;
|
| + scoped_ptr<FakeTileManager> tile_manager_;
|
| + scoped_ptr<ResourceProvider> resource_provider_;
|
| + scoped_ptr<FakeOutputSurface> output_surface_;
|
| + FakeOutputSurfaceClient output_surface_client_;
|
| };
|
|
|
| TEST_F(PictureLayerTilingSetSyncTest, EmptyBounds) {
|
|
|