| Index: cc/test/fake_picture_pile_impl.cc
|
| diff --git a/cc/test/fake_picture_pile_impl.cc b/cc/test/fake_picture_pile_impl.cc
|
| index 57a50742e3f0014639f388aa49ab5e5d5f5132ae..e7d967997850c90622ae86078ce486d3bedafba7 100644
|
| --- a/cc/test/fake_picture_pile_impl.cc
|
| +++ b/cc/test/fake_picture_pile_impl.cc
|
| @@ -7,7 +7,7 @@
|
| #include <limits>
|
| #include <utility>
|
|
|
| -#include "cc/test/impl_side_painting_settings.h"
|
| +#include "cc/trees/layer_tree_settings.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace cc {
|
| @@ -22,7 +22,7 @@ scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile(
|
| scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl());
|
| pile->tiling().SetTilingRect(gfx::Rect(layer_bounds));
|
| pile->tiling().SetMaxTextureSize(tile_size);
|
| - pile->SetTileGridSize(ImplSidePaintingSettings().default_tile_size);
|
| + pile->SetTileGridSize(LayerTreeSettings().default_tile_size);
|
| pile->recorded_viewport_ = gfx::Rect(layer_bounds);
|
| pile->has_any_recordings_ = true;
|
| for (int x = 0; x < pile->tiling().num_tiles_x(); ++x) {
|
| @@ -38,7 +38,7 @@ scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateEmptyPile(
|
| scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl());
|
| pile->tiling().SetTilingRect(gfx::Rect(layer_bounds));
|
| pile->tiling().SetMaxTextureSize(tile_size);
|
| - pile->SetTileGridSize(ImplSidePaintingSettings().default_tile_size);
|
| + pile->SetTileGridSize(LayerTreeSettings().default_tile_size);
|
| pile->recorded_viewport_ = gfx::Rect();
|
| pile->has_any_recordings_ = false;
|
| return pile;
|
| @@ -51,7 +51,7 @@ FakePicturePileImpl::CreateEmptyPileThatThinksItHasRecordings(
|
| scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl());
|
| pile->tiling().SetTilingRect(gfx::Rect(layer_bounds));
|
| pile->tiling().SetMaxTextureSize(tile_size);
|
| - pile->SetTileGridSize(ImplSidePaintingSettings().default_tile_size);
|
| + pile->SetTileGridSize(LayerTreeSettings().default_tile_size);
|
| // This simulates a false positive for this flag.
|
| pile->recorded_viewport_ = gfx::Rect();
|
| pile->has_any_recordings_ = true;
|
|
|