| 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 00338abaefea33cb166971d6c5f3e5ff1ddb061f..f1b462f3f8665da33dda1bda6d10421a684ba734 100644
|
| --- a/cc/resources/picture_layer_tiling_perftest.cc
|
| +++ b/cc/resources/picture_layer_tiling_perftest.cc
|
| @@ -74,13 +74,8 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
|
|
| timer_.Reset();
|
| do {
|
| - picture_layer_tiling_->UpdateTilePriorities(PENDING_TREE,
|
| - viewport_rect,
|
| - 1.f,
|
| - timer_.NumLaps() + 1,
|
| - NULL,
|
| - NULL,
|
| - gfx::Transform());
|
| + picture_layer_tiling_->UpdateTilePriorities(
|
| + PENDING_TREE, viewport_rect, 1.f, timer_.NumLaps() + 1, Occlusion());
|
| timer_.NextLap();
|
| } while (!timer_.HasTimeLimitExpired());
|
|
|
| @@ -104,13 +99,8 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
|
|
| timer_.Reset();
|
| do {
|
| - picture_layer_tiling_->UpdateTilePriorities(PENDING_TREE,
|
| - viewport_rect,
|
| - 1.f,
|
| - timer_.NumLaps() + 1,
|
| - NULL,
|
| - NULL,
|
| - gfx::Transform());
|
| + picture_layer_tiling_->UpdateTilePriorities(
|
| + PENDING_TREE, viewport_rect, 1.f, timer_.NumLaps() + 1, Occlusion());
|
|
|
| viewport_rect = gfx::Rect(viewport_rect.x() + xoffsets[offsetIndex],
|
| viewport_rect.y() + yoffsets[offsetIndex],
|
| @@ -139,7 +129,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| 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());
|
| + ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
|
|
|
| timer_.Reset();
|
| do {
|
| @@ -164,7 +154,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| 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());
|
| + ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
|
|
|
| timer_.Reset();
|
| do {
|
| @@ -194,7 +184,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| 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());
|
| + ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
|
|
|
| timer_.Reset();
|
| TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
|
| @@ -226,7 +216,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
|
| 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());
|
| + ACTIVE_TREE, viewport, 1.0f, 1.0, Occlusion());
|
|
|
| TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
|
| SMOOTHNESS_TAKES_PRIORITY,
|
|
|