| Index: cc/resources/picture_layer_tiling_perftest.cc
|
| diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc
|
| index 575e13e5d6984ac67394ffddd461bc2f6b165fb3..f0be5bf0717684e06751e6b6730b3198886914d0 100644
|
| --- a/cc/resources/picture_layer_tiling_perftest.cc
|
| +++ b/cc/resources/picture_layer_tiling_perftest.cc
|
| @@ -45,6 +45,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| virtual void SetUp() OVERRIDE {
|
| picture_layer_tiling_client_.SetTileSize(gfx::Size(256, 256));
|
| picture_layer_tiling_client_.set_max_tiles_for_interest_area(250);
|
| + picture_layer_tiling_client_.set_tree(PENDING_TREE);
|
| picture_layer_tiling_ = PictureLayerTiling::Create(
|
| 1, gfx::Size(256 * 50, 256 * 50), &picture_layer_tiling_client_);
|
| picture_layer_tiling_->CreateAllTilesForTesting();
|
| @@ -135,6 +136,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| gfx::Size bounds(viewport.size());
|
| picture_layer_tiling_ =
|
| PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
|
| + picture_layer_tiling_client_.set_tree(ACTIVE_TREE);
|
| picture_layer_tiling_->UpdateTilePriorities(
|
| ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
|
|
|
| @@ -159,6 +161,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| gfx::Size bounds(10000, 10000);
|
| picture_layer_tiling_ =
|
| PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
|
| + picture_layer_tiling_client_.set_tree(ACTIVE_TREE);
|
| picture_layer_tiling_->UpdateTilePriorities(
|
| ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
|
|
|
| @@ -188,6 +191,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| gfx::Size bounds(viewport.size());
|
| picture_layer_tiling_ =
|
| PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
|
| + picture_layer_tiling_client_.set_tree(ACTIVE_TREE);
|
| picture_layer_tiling_->UpdateTilePriorities(
|
| ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
|
|
|
| @@ -217,6 +221,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| gfx::Size bounds(10000, 10000);
|
| picture_layer_tiling_ =
|
| PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_);
|
| + picture_layer_tiling_client_.set_tree(ACTIVE_TREE);
|
| picture_layer_tiling_->UpdateTilePriorities(
|
| ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform());
|
|
|
|
|